fixed bugs in fabfile
merged