bump psycopg2 version to 2.5.1
Merge branch 'couchpulse' into rebuild-staging