Remove if statements from cookiecutter stuff

as they don't work

We'll put it back on a branch where I can play at my leisure
Use RedirectView CBV as default django is now 1.5

The simple.redirect_view is not available in django 1.5. Upgrading to latest
class-based view
Import sys into local settings

Previously deploy:dev was failing out-of-the-box because of L38 checking
for 'test' in sys.argv, adding import sys to localsettings
Fix issue #19 with collect static.
Merge remote-tracking branch 'bird/develop_cbv' into develop

* bird/develop_cbv:
  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.
Merge remote-tracking branch 'bird/develop_localsettings' into develop

* bird/develop_localsettings:
  Import sys into local settings
Merge remote-tracking branch 'bird/develop_static' into develop

* bird/develop_static:
  Fix issue #19 with collect static.
Allow the django jenkins package version to be set

in project_settings.py