Update to test fabfile git merge