add network-uri flag
bump text dependency
Merge branch 'master' into borders

Conflicts:
	oauthenticated.cabal