Fixed Makefiles, handle all force fields thru appropriate options