bump oh-my-zsh version
remove vim-spec-finder submodule
use p4merge