Human readable diff output and command line tool #2

Merged
merged 6 commits into from Jun 12, 2012