Incl. registration app--models, views, urls, admin, tests.
Incl. registration/forms.
Updates to base url conf.
Clean up registration urls and views.
Incl. add'l modules for registration app.
Reinclude content tag in base template.
Incl. quotes in  url tags / view name in registration templates in accordance with Django 1.5 and later.
Setting up views and templates for view_two.
Tweak settings.py to include django-registration and django-registration defaults (i.e., the templates).
Clean up base url conf.
Fix minor merge conflicts.