Update requirement to psycopg2 version 2.5
Random changes to models.py