magit関連のバッファをpopwinに
pretty change for helm popup param
Merge branch 'master' of github.com:hage/dot-emacs-d

Conflicts:
	init.el