new file:   jellybeans2.vim
Merge branch 'laptop' of github.com:brotatos/dotfiles into laptop