Update and rename bash files to make bash work properly
Update gitconfig

* Added support for DiffMerge as a mergetool
* Added p4merge as a difftool (doesn't work that well)