replaced ido with helm
Merge branch 'master' of github.com:indy/emacs-config

Conflicts:
	site-lisp/global-settings.el