Make some OS X package upgrades, and make some Makefile fixes in order to allow Armory to compile post-megamerge. Armory still won't run under OS X and will require more Makefile fixes.