some small fixes...
Merge branch 'master' of github.com:bjornhjelle/my_puppets