Changed diff tool to vimdiff now that I don't have access to beyond compare