* maps WIP
* fixing some js errors
* removed .rmvrc
* fix analytics, Modernizr doesn't include .load any more
* updated to rails 4.0.11
* fixing issue with sass-rails and sprockets
Merge branch 'master' into map

Conflicts:
	app/assets/javascripts/application.js
* updated to master
* removed deprecation warnings