Folder structure corrected
Merge branch 'master' of http://github.com/whitehatx2/puppet-openmrs
Merge branch 'master' of http://github.com/whitehatx2/puppet-openmrs