Removed heroku specific gems from gemfile and included them only if heroku selected