fix date of vi+zsh
merge master