Peters changes
Peters changes merged in successfully. This commit is functioning
Merge branch 'master' of https://github.com/agoops/DjangoTestOneDir

Conflicts:
	scripts/onedir_menu.py