sync to latest dot_vim
Fix methods and fields prefixed with underscore not showing in ctags for Coffee
Git config improvements

* Better vimdiff merge tool
* `git u` only does a fast-forward now
* Add alias dt for difftool