with forms
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'

Conflicts:
	accommodations/templates/camine.html
	accommodations/templates/index.html
	accommodations/views.py
Merge remote-tracking branch 'origin/master'
Update models to use a custom user object. Please rm and run syncdb again.
Updated user form.