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)
commit5b0fdb0b221c1096c7260b016fb9966c7557ef15
tree707a0c5eb07a6f6566508254409e140703af5bfe
parentd721c5ea0a85f24487cb73cc53cc25523d48e700
parent36484efe09fd6e5f3e511fccf2fb2001baeda265
Merge pull request #222 from cmurphy/master

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