Revert "Merge branch 'master' of https://github.com/chhernandez/CodeKite"

This reverts commit 9088066099496c2e318649a0cd41b631d6b81482, reversing
changes made to 1e861df849bcc3faa446b083fd34dc4ffb1ba241.
Revert "Revert "Merge branch 'master' of https://github.com/chhernandez/CodeKite""

This reverts commit 04aa5334a40c3915321d83de47d55cb90d40eba3.