Only use ido-ubiquitous in Emacs 24, which it now requires
Merge branch 'purcell'

* purcell:
  Only use ido-ubiquitous in Emacs 24, which it now requires