Rework of my vimrc.. almost there.