update travis
Merge branch 'oauth' of https://github.com/mapbox/tm2 into oauth

Conflicts:
	.travis.yml