shrine

Merge pull request #1154 in SHRINE/shrine from feature/SHRINE2020-634 to develop

* commit 'a4cf1eb748b74ea8a47926830349fe14a2de1d57':
  Review cleanup for SHRINE2020-634
  Circe upgrade and the non-blocking bug (not yet fixed in http4s) for SHRINE2020-634
  Updates for http4s and cats io for SHRINE2020-634