Revert "Revert "[vim] add "splice" plugin for 3-way merge conflict resolution in git""

This reverts commit 46e8c85ba0ff04e0108473a2c3414fd009f9bd51.
[git] use gvim to merge with splice
[git] change git log alias "l" to show single line per commit
[vim] switched to molokai color theme