Handled all that garbage punctuation in the keywords
Merge branch 'master' of https://github.com/ryla/surfer