A bunch of little fixes
Remove codekit config
Removed codekit config
Merge branch 'fixes'