Clean up, retire des comments.
Merge branch 'integration' of http://www.github.com/gabc/cegepofempire into integration

Conflicts:
	client.py