conflicts
add prelude as submodule
update zpresto
no more a submodule
emacs config