tmux and vimrc updated on daria2
merge conflicts