new upstream manage.py (for Django 1.4)
preparing for merging in dye files
convert to deploy files from dye project
exclude Error from tasks and fix project_settings merge
correct use of env in tasklib
on jenkins run, delete old pyc files
Merge branch 'master' into dye

Conflicts:
	deploy/fabfile.py
	deploy/tasklib.py
new files from dye
remove extraneous exception code from tasks.py
Merge branch 'master' into dye
don't work out linux type until after settings set
use new webserver settings rather than apache settings
Delete old localfab staging function
fab: use project_settings for host_list
correct the git repo URL
Correct bugs in localfab

* dye moved on so some calls needed renaming
* added function to do permissions on econsensus.log
fablib: correct bug in git processing
don't stop webserver during deploy, just unlink this vhost
Merge branch 'master' of https://github.com/aptivate/econsensus
Merge remote-tracking branch 'upstream/master'