Fixes for our mcollective configuration

Fixes #17, Fixes #13, Fixes #16