changed one of the git diff shortcuts; fixed a problem related to tmux status line