Updates to the upgrade scripts
Merge branch 'master' into paul-upgrade

Conflicts:
	django/setup_git.sh
	upgrade/upgrade.sh