rebase on bitly/master

pickup bitly/go-nsq#29 (recursive locking fixes)