Update Gemfile for heroku and minor layout changes.