Fixed #4 where IPv4 addresses would match too early.
Merge branch 'master' into iri

Conflicts:
	src/uri.js