Update gitconfig and subl settings
Merge branch 'master' of github.com:mortik/dot-files