Allow dashes and digits in origin hostname

Modified regexes to allow \\- and \d -- I *think* this is what needs to be done to fix the hostnames-with-digits issue...