Add Mac amalgamate

Also re-include a fix to Bullet (Clang friction issue)