ido and magit
Merge branch 'master' of https://github.com/datalinkE/emacs_config

merged
after last merge were some duplicate lines