Some small changes on vimrc
Major change, simplified