merge
Merge branch 'master' of github.com:GongYiLiao/Dot_Emacs

Conflicts:
	editing-goodies/my-haskell-goodies.el
tes
Merge branch 'master' of github.com:GongYiLiao/Dot_Emacs
This is a minor merge
minor merge
Merge branch 'master' of github.com:GongYiLiao/Dot_Emacs
Merge branch 'master' of github.com:GongYiLiao/Dot_Emacs
powerline now fixed