Revert "Merge branch 'earlier-messaging' of https://github.com/gooftroop/CS6310P2 into earlier-messaging"

the merge busted things.  clean up and try again.

This reverts commit c3e0491c9325e7166deaf36ec23b046281a30152, reversing
changes made to d21e6359d80985950158c8e005ddfec30cda172d.