Fix bug with urls with dashes not being resolved
Merge branch 'master' of https://github.com/sloria/wtfhack