Added configtimeout setting to puppet::agent to allow override of this default setting
Added configtimeout setting to puppet::agent to allow override of this default setting
Merge branch 'master' of github.com:redstonemercury/puppetmodule

Conflicts:
	manifests/agent.pp
Fixing merge issue
Add spec tests for configtimeout

I also cleaned up the indentation at the same time. I know it's
bad form but it's late and I can't be bothered to cerry pick.
Merge branch 'redstonemercury-master'