Update alias to Sublime 3
Set sublimerge as the prefered merge/diff tool