vim and tmux config
after merge