Unstash work-local changes and merge

- Fix gitconfig to use Kaleidoscope
- Toggle solarized background with <F10>

env

@@ -12,7 +12,7 @@
 
 export SYS=`uname -s | tr A-Z a-z`
 # Set this to a non-zero integer to see startup messages
-export NOISY=0
+export NOISY=20
 
 print_heading -l 1 'Initializing environment'
 

gitconfig

@@ -51,6 +51,8 @@
     f = fetch
 [ui]
     color = true
+[difftool "Kaleidoscope"]
+	cmd = ksdiff --partial-changeset --relative-path \"$MERGED\" -- \"$LOCAL\" \"$REMOTE\"
 [diff]
 	tool = Kaleidoscope
 [mergetool]

vimrc

@@ -126,6 +126,8 @@ endif
 
 set bg=dark
 
+call togglebg#map("<F10>")
+
 " use solarized colorscheme if the terminal can support it (or we're in a GUI)
 let g:solarized_termtrans = 1
 let g:solarized_visibility = 'low'