Ido vertical & flx
Merge branch 'master' of github.com:huangbop/.emacs.d

Conflicts:
	init.el