updated shell colors to work on windows
added git ignore matches. configured diff tools and merge tools in git