Updated update script to install homebrew if it's not already installed
Organized .gitignore
Use `vimdiff` as the default diff / merge tool. Otherwise, use `ksdiff`.