added bashrc and git-completion for cygwin
Added kdiff3 as mergetool