update
Merge branch 'master' of github.com:mattrenaud/fabric-mgmt

Conflicts:
	fabfile.py
	scripts/pma-install.sh