Adding useful smarter duplicate lines plugin, update sublimelinter config and use diff3 on my system gitconfig