did a little clean up

Added Bot#next call to the end of all the specialized expect methods

Added Bot#expectSay, Bot#expectEcho

Did some other misc changes e.g. removing comments, etc.