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

Conflicts:
	roommeet-1/people/models.pyc
pycs
Merge remote-tracking branch 'origin/newmaster' into ccweaver

Conflicts:
	roommeet-1/people/models.pyc
bugs
Merge branch 'master' into ccweaver

Conflicts:
	roommeet-1/django_cas/__init__.pyc
	roommeet-1/django_cas/views.pyc
	roommeet-1/people/__init__.pyc
	roommeet-1/people/admin.pyc
	roommeet-1/people/models.pyc
	roommeet-1/roommeet/__init__.pyc
	roommeet-1/roommeet/forms.pyc
	roommeet-1/roommeet/settings.pyc
	roommeet-1/roommeet/urls.pyc
	roommeet-1/roommeet/views.pyc
	roommeet-1/roommeet/wsgi.pyc
Merge branch 'ccweaver'

Conflicts:
	roommeet-1/roommeet/forms.py
	roommeet-1/roommeet/forms.pyc
	roommeet-1/roommeet/views.py
	roommeet-1/roommeet/views.pyc