Added some handy git configs

* alias for merging are simple and good
* git diff set to use patience by default (slower, more accurate diffs)