pycs
Merge branch 'master' into ccweaver

Conflicts:
	roommeet-1/roommeet/views.pyc
housing
Merge branch 'master' into ccweaver

Conflicts:
	roommeet-1/people/models.pyc
	roommeet-1/roommeet/settings.pyc
db changes
houses
pyc
pyc
pyc
adding houses complete
Merge branch 'ccweaver' of https://github.com/dschen/roommeet into ccweaver

Conflicts:
	roommeet-1/roommeet/views.pyc
Merge branch 'ccweaver'

Conflicts:
	roommeet-1/roommeet/views.pyc
conflicts