Update models.py
Added /profile/username/messages/ to complement /threads/, removed /my_threads/
Merge branch 'master' of https://github.com/knagra/farnsworth
Merge branch 'master' into afro
Moved house_map into base

Conflicts:
	farnsworth/urls.py
Moved house_map into base