minor cleanup of email address, and inline comments
Merge branch 'gh-pages'