added script to do nice per-word diffs
moved git-diff to just diff for better tab completion
removed a couple superfluous statements, reworded some unclear ones