prevent marvel install from conflicting with plugin management
Merge branch 'master' of github.com:meltwater/puppet-es