added in sublimerge as diff and mergetool
removed ip command due to crazy CPU spikes
added turing shortcut
fixed custom plugins folder