Cleanup and paredit fix for evil-mode
Inlude prelude-modules.el on personal branch