put in gem lockfile for Heroku
upgrade to Rails 4.1