merged registration with home
Merge branch 'master' of https://github.com/journeystone/rockit

Conflicts:
	rockhq/bootstrap_toolkit/templatetags/bootstrap_toolkit.pyc
	rockhq/bootstrap_toolkit/widgets.pyc
	rockhq/home/forms/forms.pyc
	rockhq/home/forms/register.py
	rockhq/home/models.py
	rockhq/home/models.pyc
	rockhq/home/views.py
	rockhq/home/views.pyc
	rockhq/registration/__init__.pyc
	rockhq/registration/models.pyc
	rockhq/registration/views.py
	rockhq/rockhq/settings.py
	rockhq/rockhq/settings.pyc
	rockhq/rockhq/urls.pyc
Merge branch 'master' of https://github.com/journeystone/rockit

Conflicts:
	rockhq/home/views.pyc
Should work
Mostly done, need to get login form working (ajax) + add some fields to registration form
(And actually get them inserting into d atabase)