Unstash work-local changes and merge

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