break out expanding URL
add support for "new" url templates

without the query string
test with new url format
install help2man
better variable name, doesn't cause shadowing
drop unused variable
give example in new url format
Merge branch 'feature/new_templates'