Allow disabled diminish.  Fix python indenting.
Merge branch 'master' of github.com:beltiste/.emacs.d

* 'master' of github.com:beltiste/.emacs.d:
  Fix python indenting being reset.