Bitswap Rounds CR suggestions

@whyrusleeping this branch contains suggestions (in the form of commits) for #417 #438.