Updating project structure to utilize 2scoops project layout.
Fixing merge issues in process of combining old code with new.
Setting up grappelli, django-debug-toolbar and django-extensions for development.
Merging dev with master branch