added some vim and emacs stuff
merge