revisions, comments, and suggestions, with more to come in person...
Merge pull request #1 from stouffer/master

revisions, comments, and suggestions, with more to come in person...