Merge pull request #397 from mhaskel/puppet_not_shell