npm install in puppet permissions fix
Merge branch 'master' of https://github.com/hyperreal/Acacia
Merge branch 'master' of https://github.com/hyperreal/Acacia