Better mcollective integration
Merge remote-tracking branch 'upstream/master'

Conflicts:
	Gemfile.lock
Merge branch 'master' of github.com:moovweb-operations/ruby-enc