Cleaning up fabfile.
Idempotency on fabfile.
Merge branch 'master' into offline

* master:
  Idempotency on fabfile.
  Cleaning up fabfile.