Remove unnecessary path modification.
Merge branch 'distribute' into v2.0-prep

Conflicts: These files are gone in this branch.
	armstrong/dev/tasks/__init__.py
	armstrong/dev/virtualdjango/__init__.py