Fix small things in vimrc and remove unused stuff