Upgrade nsq-cluster and clean up specs a bit

@freerobby Peep this. Pretty light changes. Less code!