fix travis break
Merge branch 'master' of https://github.com/mapbox/tm2