.tmux.conf added
conflict fixed
alias VimFiler