update unite configuration on vimrc
merge master