change to force eric williamson to rebase
force eric to handle a merge conflict here too
(maint) make file1 smart

Prior to this commit file1 spoke gibberish. This commit
changes it to speaking smartly.
(maint) use consistent whitespace

Prior to this commit file3 would use inconsistent line length.
This commit changes it to use 80 char line length.