Run travis against ruby 2.1, new ohai v requires it
Merge branch 'master' of github.com:jonlives/knife-spork