Resolve vimrc merge conflict
Merge branch 'master' of https://github.com/edlandm/dotfiles
Update plugin magic files
Add vim-orgmode and its dependencies