vimrc and install
merge master into master