Codekit config change.
Merge remote-tracking branch 'inriverie/master'
Conflict fix???