Merge remote-tracking branch 'laurenrother/readme' into 1.0.x
authorHunter Haugen <hunter@puppetlabs.com>
Fri, 27 Jun 2014 17:17:01 +0000 (10:17 -0700)
committerHunter Haugen <hunter@puppetlabs.com>
Fri, 27 Jun 2014 17:17:01 +0000 (10:17 -0700)

Trivial merge