cleaning up the map and form UI
Merge branch 'master' into update-filecontent

Conflicts:
	app/views/maps/index.html.haml
trying to simplify the export form views