Adjusted the url matching regex to allow underscores and dashes
Merge branch 'master' of https://github.com/KoffeinFlummi/PyGHI