make the linux build update the travis-osx branch
attempt to fix osx build thing
whoops token got out. it was revoked.
more fixes for osx travis
surely last fix for osx
Merge branch 'master' into travis-osx

Conflicts:
	.travis.yml