Add tmux.conf and small update to vimrc
Fix premature commit