Don't use electric-indent-mode because it removes trailing whitespace on
"-- "
Complete with <tab>
Merge branch 'master' of github.com:rafoo/my-emacs-config