readded psycopg2 which is needed for heroku
Merge branch 'conventions' of https://github.com/jquesnelle/penguicontrax into conventions
why is this not fiesable