Setting the ruby version to 2.0.0 so Heroku doesn't complain
Adding the rails_12factor gem because Heroku is still complaining
Merging from heroku/master