Feature/fedmsg tail query combined

Not sure how 212f5f3 and d9ceaec snuck in.  This is just supposed to be efd8d24