Merge branch 'master' into btchen
meh
Distance (kind of)
distance works
pyc
Merge branch 'btchen'

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