Merge remote-tracking branch 'laurenrother/readme' into 1.0.x
authorHunter Haugen <hunter@puppetlabs.com>
Wed, 18 Jun 2014 16:00:06 +0000 (09:00 -0700)
committerHunter Haugen <hunter@puppetlabs.com>
Wed, 18 Jun 2014 16:00:06 +0000 (09:00 -0700)

Trivial merge