About whitespaces
Python tools
Merge branch 'master' of https://github.com/calve/emacs.d

Conflicts:
	emacs
Git commit face