Tidying up settings.py a little
Changing from deprecated django.conf.urls.default to django.conf.urls
Merge branch 'master' of github.com:oakling/Oakling