Copied plug.hs into uri.hs
Merge remote-tracking branch 'upstream/master' into integrate_network_uri

Bring this branch up to date with current upstream/master