agenda
Merge pull request #19 from andymckay/agenda

second pass