Recommit with improvements

Had a botched email configuration. Recommiting with changes to local
GitHub and changes to source.