Upped psycopg2 to 2.5.1 to deal with greenlets hang on network issues (http://psycopg.lighthouseapp.com/projects/62710/tickets/113)
Merge branch 'master' into u/ixa1