mainline vimrc
replace makefile with manage script
merge master