Merge pull request #14 from martinb3/master

Miscellaneous fixes to make test-kitchen work