Misc changes to emacs and vim configs