global gitignore: Ignore .kitchen/
Merge remote-tracking branch 'origin/master' into mac