codekit config
Merge remote-tracking branch 'inriverie/master'