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


No differences found