ready for deployment?
changed postgres config
changed db config again
changed db config back
cleaned up gemfile
added link to readme
fixed merge
fixed