Finished cleaning up the vimrc