Revert "Use global-aggressive-indent-mode and diminish away"

This reverts commit aa096156c93c66fc08bfbc5ca9c97207a2086fa8.