Patched for security vulnerability in Rails.

Specs ran fine.
Merge branch 'master' into feature/heroku_conversion

Conflicts:
	Gemfile
	Gemfile.lock
upgraded to heroku 2.34
heroku_db_env not responding well to rails patches for security
verifying if it has to do with rails patch
don't think heroku_db_env is compatible with ruby 1.9