adding houses complete
Merge branch 'ccweaver' of https://github.com/dschen/roommeet into ccweaver

Conflicts:
	roommeet-1/roommeet/views.pyc