integrating codekit, first commit on this branch