Install Fugitive plugin. Uninstall overblown snippets.
Use different cursors for different modes in iTerm.