Fix merge-faces in powerline.
Added diff-hl package and map ibuffer to C-x C-b
Customize diff faces.
Added diff-hl package to smotitah.