Vim: Update plugins
Git: Use patience merge strategy option when merging
Git: Use histogram diff by default
Git: New alias `check`
Vim: Add vim-indent-object plugin
Vim: Update plugins