Some minor improvements to the Uri
Merge branch 'develop' of https://github.com/http4s/http4s into develop
Fix merge conflict