Reformat magit cherry

Re-formatting `magit-cherry.el` so that all lines are shorter than 80 characters as requested.

This is supposed to be applied on top of #705 as that one changes certain things in `magit-cherry.el`. Therefore this pull request lists those commits, too. Sorry for that, but should be the least amount of work to merge if #705 is merged prior to this one.