fix directory and file permissions
Merge branch 'fix_permissions' of https://github.com/saz/puppetmodule into saz-fix_permissions