Add support for using a PyPI Cache server for faster downloads.
Merge branch 'develop' into pypi_cache
Add release note about modifying project_settings.py, as requested.
Add release note about extra argument to check_for_local_changes
Don't abort if pypi_cache_url is not configured in project_settings.py
Merge remote-tracking branch 'origin/pypi_cache' into develop

* origin/pypi_cache:
  Don't abort if pypi_cache_url is not configured in project_settings.py
  Add release note about modifying project_settings.py, as requested.
  Add support for using a PyPI Cache server for faster downloads.

Conflicts:
	release-notes.mkd

Also edited the notes for pypi cache to say it's optional
Remove else clause of pypi cache project settings

as it is now optional
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
Print the command line that failed if "pip install distribute" fails. Usually the virtualenv moved.
Merge pull request #13 from qris/print_pip_oserror

Print the command line that failed if "pip install distribute" fails.
Use _link_files for debian style apache conf

_link_files will check if the target already exists, fixing
"failed to create symbolic link `..': File exists'". errors.
Merge branch 'develop' of https://github.com/aptivate/dye into develop
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.
Merge branch 'develop' into tasklib_refactor

* develop:
  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.
  Remove if statements from cookiecutter stuff
  Remove else clause of pypi cache project settings
  Don't abort if pypi_cache_url is not configured in project_settings.py
  Add release note about extra argument to check_for_local_changes
  Add release note about modifying project_settings.py, as requested.
  Add support for using a PyPI Cache server for faster downloads.
Allow the django jenkins package version to be set

in project_settings.py