remove inlet, fix #677
Merge branch 'master' into no-inlet

Conflicts:
	app/app.css
Merge pull request #686 from mapbox/no-inlet

remove inlet, fix #677