rebase on bitly/master

this picks up the logging improvements to include topic/channel

and supercedes #3 (cherry-picked commit)

cc @domwong @iand @davegardnerisme