#12: adding puppet manifests and modules
#11: adding vagrant config
Merge branch 'develop' of https://github.com/Spantree/okmercury into develop