This now works, including my (rb|json) fix
Merge branch 'wtf'

Conflicts:
	bin/cucumber-chef
This is turning into a massive PitA