Final (?) OS X build fixes. OS X Armory now runs post-megamerge.