scripts to maintain parallel OS X branch
move back to original branch
make .travis.yml work unchanged on OS X