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)
commit39ebab80b2eb7fcce15a2b34608af3af32a960da
tree068e3bdc52e324ecc38e71586ba0235b01d74564
parentd4931055d98f2836397cea66bb966843ec936353
parent18eac98d881f01de61aa53963d5c8435f5b4acb8
Merge pull request #391 from cmurphy/master

Update .travis.yml, Gemfile, Rakefile, and CONTRIBUTING.md