Merge improvements of URL handling
* Handle IPv4 addresses correctly
* Do not treat TLD specially --- it should be possible to set specific
levels for TLDs
* The above also fixes handling of two-letters 2nd level domains, so now
it is possible to set level, for example, for ab.cz