Here is what I have staged for commit. The only differences from v1 aresome very light edits.
-- nathan