Kaleidoscope
merging
Merge branch 'master' of github.com:dfm/dotfiles