emacs conf and updated vim conf