Stop using tap to support ruby 1.8.6
Fix merge conflicts
Whoops missed a variable rename
Merge pull request #2 from sportngin/support-ruby-1.8.6

Add support for ruby 1.8.6 and chef 6.2