misc stuff
changed git merge tool back to emacs