Merge new version of fisa-vim-config and make change to tmux.conf