modified vimrc
merge from ubuntu