removed mergetool files
added *.org to .gitignore