gitconfig changes

* `git trim` now also trims merged branches
* renamed `git cleanup` to `git clear` as a way of resetting the branch and clearing all changes made to it