revert to habtm syntax, get rid of extra actions in talk
minitested past upcoming and proposed talks