pycs
Merge branch 'ccweaver' of https://github.com/dschen/roommeet into ccweaver

Conflicts:
	roommeet-1/people/models.pyc