We differ from master only in this file. Needed to get travis to build us in an osx vm
added missing ci-osx.sh file
[skip ci]
set executable on ci-osx.sh
Merge branch 'master' into travis-osx
Merge branch 'master' into travis-osx

Conflicts:
	.travis.yml
remove notification[skip ci]
merge with master for CI on osx
merge with master for CI on osx
merge with master for CI on osx
merge with master for CI on osx
merge with master for CI on osx
ci-osx.sh imported from travis branch
Merge branch 'travis-osx' into fix-travis-branch