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
Add colon to mysql root password prompt

Relates to issue #14
fab: Ensure valid_envs is always set
fab: add lots of requires

so we get a sensible error message if you forget to add
staging/production/xyz before your key command
Merge branch 'develop' of git://github.com/aptivate/dye into develop

* 'develop' of git://github.com/aptivate/dye:
  Add colon to mysql root password prompt
  Improve cookiecutter sections
  Add cookiecutter prefix to variables used in if statements
  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.
  cookiecutter: use the use_pytest variable in manage.py
  Revert "Remove if statements from cookiecutter stuff"
  Remove if statements from cookiecutter stuff
Change capitalisation of MySQL in prompt
release-notes updates
Update local_settings variables

have DEPLOY_ENV with the environment being used and have the verbose
version be called DEPLOY_ENV_NAME

Later we might move to the DEPLOY_ENV being put into a one line python
file by tasks.py and used for other things, but for now it will do.
add cookiecutter prefix to more vars
Add haystack settings to cookiecutter project

for django_type normal or cms

These are set to use localhost in development, fen-vz-elasticsearch for
dev and staging, and lin-elasticsearch over openvpn for production.  The
index name is set so it will be unique for each environment.