houses!!!!
more house stuff
Merge remote-tracking branch 'origin/mjd3'
pyc
pyc
makin the cursor do good stuff when it hovers over links
Merge remote-tracking branch 'origin/mjd3'
Merge branch 'master' of https://github.com/dschen/roommeet
Merge branch 'master' into ccweaver

Conflicts:
	roommeet-1/people/models.pyc
	roommeet-1/roommeet/settings.pyc