Merge branch 'ssh_config' into 1.1.x
Updating hash for puppet module
Updating to use puppet-forumone 1.1.4 and removing dependency on PEAR
Merge branch 'update_1.1.4'

Conflicts:
	puppet/Puppetfile
	puppet/Puppetfile.lock