changed vim setup to not use janice and redoing emacs setup