light changes to fab file, allowing local commit
Merge branch 'master' of https://github.com/rootio/rootio_telephony

Conflicts:
	fabfile.py
trying to sync