Adds additional Vim plugins
Uses new base16 color theme for terminal
Introduces diffconflicts as new merge tool for Git