Only use ido-ubiquitous in Emacs 24, which it now requires
Don't use ido-ubiquitous-disable-in, which has been removed upstream

Fixes #127
Merge branch 'master' of https://github.com/purcell/emacs.d