Some small cleanups and updates on my vimrc