Update to Django 1.6.1

Also update Django project layout and manage.py. Previous manage.py is now depreciated.