Added codekit-config.json to .gitignore
adding files to ignore
ficing merge issues