spaces over tabs in gitconfig
Merge master
Fixup kdiff3 config for git
whitespace highlighting and new lines
smaller indents for js and html
Cleanup little used features
Merge remote-tracking branch 'origin/windows' into windows