init commit w/ cookiecutter-django (cheers pydanny)
Merge mess: