syncing with master
Merge branch 'master' into ccweaver

Conflicts:
	roommeet-1/django_cas/models.pyc
	roommeet-1/roommeet/forms.pyc
	roommeet-1/roommeet/settings.pyc
	roommeet-1/roommeet/urls.pyc
	roommeet-1/roommeet/views.pyc