Misc. editing, removing links to geographic_items/index.
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/views/navigation/_quick_bar.html.erb