Add custom vim bundle file (for spf13) with Splice
Add vimdiff mergetool def in gitconfig
Switch to splice as default mergetool
Add def for splice as mergetool
Update prezto