rebase on bitly/master

pull in bitly/go-nsq#33