added PropertyMonitor ZP and switched vSphere to master branch
Merge pull request #4 from zenoss/feature/ZEN-15423

fixes ZEN-15423: added PropertyMonitor ZP and switched vSphere to master branch