Change git editor to subl
Merge branch 'master' of https://github.com/cmaitchison/dotfiles