Sync with Upstream and Add Kaleidoscope as git diff tool