Tweak URL trapping regex to handle terminating punctuation better