reordered tmux config; changed git diff to be colorful