fixed puppet modules
Merge branch 'master' of github.com:andyichr/scratch