Merge pull request #129 from bodepd/1_1_1

update 1.1.1 release
Merge pull request #133 from puppetlabs/master

backport 1.1.0 release to folsom branch