Added VM group tagging
Merge pull request #103 from greese/develop

Merge upstream changes