Merge branch 'master' of https://github.com/garaemon/emacs.d
add powerline mode
Merge branch 'master' of https://github.com/garaemon/emacs.d

Conflicts:
	lisp/garaemon-dot-emacs.el