Make changes I have been wanting to make for a while to my vimrc
Fix merge conflicts