Sync with hydrogen

* Add evil
* Move better-defaults into contrib/
* No themes