Bump to Rails 4.1.1 (security fixes).
Merge branch 'upgrade-rails'
Merge branch 'master' into deploy-to-heroku

Conflicts:
	Gemfile.lock
Gemnasium for tracking dependent gems.
Merge branch 'master' into deploy-to-heroku
Point to the live application.