Fix avengers assemble config
Stop using diff3
Fix ntsf:sd:suv:: config
Set up git-toolbelt and the vc command
Add project directory aliases
Ignore vim plugins and tmp directory