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.
Add missing {% endif %} for haystack configuration
Merge pull request #30 from qris/fix_missing_endif

Add missing {% endif %} for haystack configuration
crispy_forms is required by settings.py, so we must install it first.
Merge pull request #32 from qris/fix_missing_crispy_forms

crispy_forms is required by settings.py, so we must install it first.
Merge branch 'develop' into tasklib_refactor

* develop:
  crispy_forms is required by settings.py, so we must install it first.
  Add missing {% endif %} for haystack configuration
  Add haystack settings to cookiecutter project
  add cookiecutter prefix to more vars
  Update local_settings variables
  release-notes updates