Fix lots of stuff :-/
Merge branch 'master' of github.com:rapid7/marionette.carpenter