Readability fixes.

Squash-merge of JulienPalard's work in #35, with some tweaks to make replace_all actually work.
Merge branch 'master' of github.com:jeffkaufman/icdiff