switch to a python implementation of bcrypt for heroku
different version numbers for the py version of bcrypt
remove cffi
add psycopg2
derp, ==
Merge pull request #1 from naudo/heroku-fixes

Heroku fixes