fix buttons
try
pyc
button changes
stuff
attempt
Merge branch 'newmaster' into btchen2

Conflicts:
	roommeet-1/people/models.pyc
	roommeet-1/roommeet/bootstrap/gmap.js
	roommeet-1/roommeet/forms.pyc
	roommeet-1/roommeet/local_settings.pyc
	roommeet-1/roommeet/templates/buttonfill.html
	roommeet-1/roommeet/templates/housefill.html
	roommeet-1/roommeet/templates/managehousetablefill.html
	roommeet-1/roommeet/templates/meet.html
	roommeet-1/roommeet/urls.pyc
	roommeet-1/roommeet/views.pyc