Update gitconfig
Try out splice as a VIM mergetool
Merge branch 'master' of https://github.com/sjhcockrell/dotfiles