Configure Kaleidoscope as difftool & mergetool
Move general settings above those with headers
Increase history limit
Add 'bower_components' to Ctrl-P ignored directories