Bit of formatting in settings.py
Created a simplified django project for testing

In addition to the regular "django" buildout part, we now have a
"django-simple" part, which installs a **much** simpler django
project. django-simple can still run the competition app and all of
its nose tests, but it doesn't have all the developer tools.

django-simple was added so that continuous integration services (like
Travis) can run tests without having to install every package ever.
Cleaned up Makefile and changed test to use django-simple