Updates to fabfile. includes fix for issue #749
Merge remote-tracking branch 'upstream/master'