Merge lp://staging/~bloodearnest/django-preflight/gargoyle2 into lp://staging/django-preflight

Continuation of mfoords MP: https://code.launchpad.net/~canonical-isd-hackers/django-preflight/gargoyle/+merge/106374

The code should not depend on settings.USE_GARGOYLE.

Other than that all looks good.

- swap l. 72 and 73 around
- l 109, 120, 143, 155: fix whitespace before :
- l.280: why not add in l.270?
- l.398: what's the need of renaming the example_project folder?
- l.428: since you renamed the db, why add the old name to bzrignore? (l. 9)

Can you also include a screenshot of how the new template looks like with the flags?

> The code should not depend on settings.USE_GARGOYLE.
>
> Other than that all looks good.

Done

> - swap l. 72 and 73 around
> - l 109, 120, 143, 155: fix whitespace before :
> - l.280: why not add in l.270?

Done the above

> - l.398: what's the need of renaming the example_project folder?

This is unfortunately necessary because the nexus package (a dep of gargoyle) is higher in sys.pth when run with "python setup.py test", and it erroneously includes its example_project directory, meaning that the test_suite in setup.py ("example_project.run.tests") was finding the wrong example_project module and failing.

Pull request to exclude example_project upstream: https://github.com/disqus/nexus/pull/5

> - l.428: since you renamed the db, why add the old name to bzrignore? (l. 9)

Done - a left over from earlier

Screen shot

http://ubuntuone.com/7Khn6iSg9KAPF6JDCVebk0

Good work. Thanks.