added new diff/merge tool; changed alias for git difftool; changed Sublime alias; added git branch
added symlinks to make file
correct some output of the make file