Updated gitconfig to be a little cleaner

  * and removed old cruft