hmm, not working...
Switching the puppet module to the Hiera branch for testing.
update puppet module
update apache module
update hiera module and install it, and create 'common' and 'user' in hierarchy
update puppet module and set up user interpolated hierarchy
Change puppet module to master branch and do minimum hiera setup in node manifest
Merge branch 'master' into user-ssh-keys