Update psycopg2==2.4.1 -> psycopg2==2.5
Merge pull request #686 from caktus/update-psycopg2

refs #193 - Update psycopg2