more updating of database yaml
Added gem to help with heroku
updated gemfile.lock
not using root?
moar updates
testing different settings
Merge branch 'master' of github.com:Tfreddy/too