Update Gemfile.lock for heroku
Clean up the gemfile for Rails 3.2