Made some changes, based on advice from @kevingranade.
Merge branch 'MakefileDynamic' into FrankenMod

Conflicts:
	Makefile