Reordered and cleaned .vimrc