removed old shell_out tricks from diff.rb, fixed whitespace