syncing with master
Merge branch 'ltolias'
Merge branch 'master' of https://github.com/dschen/roommeet

Conflicts:
	roommeet-1/django_cas/__init__.pyc
	roommeet-1/django_cas/middleware.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/templates/profile.html
	roommeet-1/roommeet/urls.pyc
	roommeet-1/roommeet/views.pyc
no changes
bs
error checking
making profiles look nice
Merge branch 'master' into ltolias