magit and git-modes partying hard

Please don't merge until the two pull requests below have been merged.

(Tempory: these are pull reguests inside the magit and git-modes repositories, they will appear shortly.)