Merge branches 'master' and 'master' of github.com:chrispoole643/etc
Change column format, remove tags from agendas, and change agenda prefixes