Re-enable maps, add votes to seeds
Merge branch 'votes' of github.com:kellyjosephprice/ramblr into votes

Conflicts:
	app/assets/javascripts/routers/location_router.js
	db/seeds.rb