travis-ci script for OS X
Merge branch 'macosx-travis' into macosx

Conflicts:
	.travis.yml