Revert "Remove if statements from cookiecutter stuff"

This reverts commit 951a7bcf9b827d0b4d3b5533a8d2470bd24e4657.

doing this on a branch where we can play at leisure without getting in
the way of other developers
cookiecutter: use the use_pytest variable in manage.py
correct invalid json

It's not valid json to have a comma before the closing bracket. Cookiecutter
won't run without removing this trailing comma.
Truncate database username to 16 characters
Fix variables missing cookiecutter. prefix

Some of the templates were, for example, just {{project_name}} rather than
{{cookiecutter.project_name}}
Merge remote-tracking branch 'bird/develop_correcttemplates' into develop

* bird/develop_correcttemplates:
  Fix variables missing cookiecutter. prefix
Merge remote-tracking branch 'bird/develop_truncate' into develop

* bird/develop_truncate:
  Truncate database username to 16 characters
Don't use timedelta total_seconds() method

as it was only introduced in python 2.7
Add cookiecutter prefix to variables used in if statements

D'oh
Merge branch 'develop' into cookiecutter_with_if

* develop:
  Don't use timedelta total_seconds() method
  Fix variables missing cookiecutter. prefix
  Truncate database username to 16 characters
  correct invalid json
  Allow the django jenkins package version to be set
  Fix issue #19 with collect static.
  Import sys into local settings
  Use RedirectView CBV as default django is now 1.5
  Use _link_files for debian style apache conf
  Print the command line that failed if "pip install distribute" fails. Usually the virtualenv moved.

Conflicts:
	cookiecutter.json
Improve cookiecutter sections

- Add more cms stuff to settings.py
- make more stuff cms OR normal