add folding and update vimrc setting
merge with new version