Replace johnw's ido-hacks with ido-ubiquitous

This fixes auto-insert for emacs lisp files.  Something in ido-hacks
prevented selecting no keyword to get out of keyword insertion mode.
Merge with changes from github topic/try-johnw