Merge branch 'heroku/master'

Conflicts:
	.gitignore
	Gemfile
	Gemfile.lock
	app/assets/javascripts/application.js
	app/assets/stylesheets/mapss.css.less
	app/controllers/maps_controller.rb
	app/helpers/maps_helper.rb
	app/models/school.rb
	app/models/votes_total.rb
	app/views/maps/_map.haml
	app/views/maps/index.html.haml
Merge branch 'master' into style