Rewrite after Toronto.

Incorporated some thoughts from discussions in Toronto. This is largely
bike shedding (and, I’m trying out the GitHub Desktop GUI. So far I
don’t see the point / prefer the standard git CLI).
Merge pull request #1 from wkumari/master

Rewrite after Toronto.