Rearrange Gemfile; heroku deployment issues
Update dependency file
More Gemfile shuffling