fixes for upgrading rails
Merge branch 'for_reviewers' of github.com:princelab/metriculator into for_reviewers

Conflicts:
	Gemfile
	app/assets/stylesheets/application.css
	app/assets/stylesheets/custom.css