Improve keyword lookup
Change wildfire.vim mappings to single keystroke