Don't use ido-ubiquitous-disable-in, which has been removed upstream

Fixes #127
Merge remote-tracking branch 'purcell/master'