Revert "Removed IDO"

This reverts commit 96baf1879a5d004127d13ca511c176d35969b3df.

Conflicts:
	.emacs-custom.el
Merge remote-tracking branch 'refs/remotes/upstream/master'