Resolve VimRC conflicts between yank-ring, ctrlp, and vimsplits
Resolve upstream merge
Remove a few oldies (but goodies)
Resolve upstream merge on _vimrc
Fix typo in vimrc