Use diminish to clean up mode-line.
Merge branch 'master' of github.com:ZaneA/Dotfiles

Conflicts:
	emacs.el