helm
Merge branch 'master' of https://github.com/opsound/.emacs.d into origin-master

Conflicts:
	init.el