Added configtimeout option
Merge branch 'master' of https://github.com/example42/puppet-puppet