heroku toolbelt stuff
small style changes
conflict resolved