migrating to the new vagrant-puppet strategy

…and updating es to 1.0.0.RC2, adding marvel
Merge pull request #8 from Spantree/feature/update_to_es_1.0

migrating to the new vagrant-puppet strategy