tv 0.6.1
Merge branch 'master' of github.com:mapbox/tm2

Conflicts:
	package.json