Commit local change prior to merge
Merge branch 'master' of github.com:ade25/ade25.fabfiles

Conflicts:
	setup.py