esc timeouts
update oh-my-zsh
replace ctrlp with unite
merge