Add vim-mercenary and vimrc updates.