refactored provisioning and added 2 dev machines
Merge branch 'master' of https://github.com/skolr/skolr-metrics
merging to local copy