Added tmux.conf
fixed merge issue in vimrc