Remove uneeded fold-this package (evil can already do this). Tweak some key bindings (M instead of m for Major modes key bindings).