House cleaning for better or worse.
 - re-enabled smart-mode-line
 - moved more opts to custom.el