Using git branch for deploy

Conflicts:
	fabfile.py