Use urllib instead of regexes to work with URLs where possible
Update Travis and hooks
Fix Travis failure
Merge branch 'urljoin'