changed editor and mergetool to Sublime Text \o/