rebase on bitly/master

pickup bitly/nsq#29 (recursive locking fixes)