Make node.rb switch to puppet user to avoid cache issues
Add use_vhost support to generate conf file without vhost
Add --no-environment option to node.rb
Merge pull request #1 from theforeman/master

Resync with upstream