Merging changes from master
erge branch 'master' into 1.1.x

Conflicts:
	puppet/Puppetfile
	puppet/Puppetfile.lock
Added readme.
Merge pull request #5 from forumone/3-readme

Added readme.