Fix an issue with keywords that have spaces
Keyword completion
Merge branch 'master' of https://github.com/kevintavog/MapThis