syncing
Revert "Merge branch 'master' into ccweaver"

This reverts commit 77d716d45f0e9bac916952e07695276a2b0fa1ef, reversing
changes made to 000106448de2b9bdb84dc9d1091ea8b2f6d44abc.
Merge branch 'master' into ccweaver

Conflicts:
	roommeet-1/django_cas/__init__.pyc
	roommeet-1/django_cas/middleware.pyc
	roommeet-1/django_cas/views.pyc
	roommeet-1/people/admin.pyc
	roommeet-1/people/models.pyc
	roommeet-1/roommeet/forms.pyc
	roommeet-1/roommeet/settings.pyc
	roommeet-1/roommeet/urls.pyc
	roommeet-1/roommeet/views.pyc