Minor updates:

* git config formatting
* kaleidescope for diff and merge
* remove java 1.6
* vim supertab config
* google codejam path