Magit has fixed some things upstream, remove hacks

* Fixed windowing in
  magit/git-modes@a67f6eadeb940ac369b3560eac60105e3880b1cc
* Fixed newline insertion in magit/git-modes@1393d0fa9fbab1c5ed1f86131367098808eedd3f