Ignore vim/.netrwhist please
vim-plug is no more my plugin manager of choice
Use vundle and install a bunch of plugins
Ultrafix merge conflicts