added zshrc options to add arrow-key history search, plus auto-start screen for every new terminal
added a bunch of git magic, including making vimdiff work nicely as the difftool, enabling rerere, setting the conflict style, and adding a bunch of aliases