Updated fabfile.
Better merging
Even better merging
Fetch staging branch first before checking it out
Fetch origin
Stage on master branch, production on production branch.
Merge branch 'better-fabfile' see #1