keep undo/ in .vim; but ignore in Git
Merge branch 'nonminimal' of github.com:echristopherson/.vim into nonminimal