Update mergetool settings to use Splice
Update go, html & html tabbing defaults.
Merge branch 'master' of github.com:brianmcdonnell/dotfiles