OS X build tweaks, getting tests working for variable python versions