Remove a bunch of vagrant/kitchen cruft
Merge pull request #232 from claco/master

Merged automatically by jenkins after successful build test