stuff
stuff
Merge branch 'master' of github.com:shm/dotfiles
use vim as default EDITOR