More fanciness for my contrib
typo
Merge branch 'trishum' into develop

- Aggressive indent
- Hungry delete
- Remove smooth scrolling which is now in spacemacs layer