Make a non-idempotent integration test, idempotent
Make a non-idempotent integration test, idempotent
Merge branch '1.9' into 1.10
Merge branch '1.10'
Sometimes (eg parallel), self.message is None, which makes the exception unprintable.
Merge branch '1.9' into 1.10
Merge branch '1.10'
Add test which fails on Paramiko 1.15.0 re: agent forwarding
A herp and a derp
Merge branch 'refs/heads/fabfile-conf' into develop

* refs/heads/fabfile-conf:
  Add support for json/yaml config file alongside with fabfile
Merge branch 'refs/heads/multiple-env-states' into develop