migrating to the new vagrant-puppet strategy

…and updating es to 1.0.0.RC2, adding marvel