etherpad vim
Merge branch 'intel' of github.com:ppalucki/dotfiles into intel