Certnames must be lowercase
Add Apache 2.0 license.
Merge pull request #15 from apenney/license

Add Apache 2.0 license.
Merge branch 'master' of https://github.com/puppetlabs/puppetlabs-puppet
Added configtimeout parameter to puppet.conf template
Merge branch 'master' of https://github.com/inkblot/puppetlabs-puppet
Merge branch 'configtimeout'

Conflicts:
	templates/puppet.conf-agent.erb
Merge pull request #1 from interlegis/configtimeout2

Configtimeout2