zoomedto baseing
inline-block the delete span
Merge branch 'mbbase' of https://github.com/mapbox/tm2 into mbbase

Conflicts:
	app/app.css
	templates/libjs._
	templates/style._
Merge branch 'mbbase' of https://github.com/mapbox/tm2 into mbbase