Add diminish
Diminish abbrev-mode
Port more of my evil config