Add --osx-arch option so the desired build architecture can be specified
Merge branch 'more-tweaks' into dev