Fetch origin
Merge branch 'better-fabfile' into staging #1