+ fugitive

Change-Id: I47ea44f64c3787c9a85c453b4e26829fbe34ae81
+ gvimmerge: opens a gvim with some tabs to resolve conflicts

Change-Id: I5d797655d5f7f316f25acf13c9e9295fd3599893