add location bookmarks, closes #134
Merge branch 'master' into bookmarks

Conflicts:
	app/app.css
	templates/style._
add bookmarks to source view
Merge pull request #224 from mapbox/bookmarks

Bookmarks