Removed coverage from requirements
Merge branch 'master' into psycopg

Conflicts:
	requirements.txt
Better constraint handling
Merge branch 'master' into psycopg