adds sublimerge as merge and diff tool
removes proxy setting for standard preferences
Merge branch 'master' of https://github.com/johannes82/.dotfiles