windows dir fix
smex revised
Merge branch 'master' of https://github.com/PHELiOX/.emacs.d

Conflicts:
	pheliox-load-plugins.el
ibus.el