Updated fabfile.
Better merging
Even better merging
Merge branch 'better-fabfile' into staging see #1