Added tmuxline.vim
added tmux.conf
resolved merge conflicts