Merge pull request #222 from cmurphy/master
authorMorgan Haskel <morgan@puppetlabs.com>
Tue, 9 Dec 2014 16:23:58 +0000 (08:23 -0800)
committerMorgan Haskel <morgan@puppetlabs.com>
Tue, 9 Dec 2014 16:23:58 +0000 (08:23 -0800)
Update .travis.yml, Gemfile, Rakefile, and CONTRIBUTING.md


Trivial merge