ido mode, indent
Merge branch 'master' of github.com:SKoschnicke/dotfiles

Conflicts:
	emacs
fixed merge error