Modified regex in url mapping for locations to accept '-' in hostnames. ...

...Fixes #95