Add .mailmap entries for myself, and sort the list

Author: jroelofs

.mailmap

@@ -22,7 +22,10 @@
 #
 # Please keep this file sorted.
 
-Martin Storsjö <martin@martin.st>
+<i@maskray.me> <maskray@google.com>
 <rnk@google.com> <reid@kleckner.net>
 <thakis@chromium.org> <nicolasweber@gmx.de>
-<i@maskray.me> <maskray@google.com>
+Jon Roelofs <jonathan_roelofs@apple.com> Jon Roelofs <jroelofs@jroelofs.com>
+Jon Roelofs <jonathan_roelofs@apple.com> Jonathan Roelofs <jonathan@codesourcery.com>
+Jon Roelofs <jonathan_roelofs@apple.com> Jonathan Roelofs <jroelofs@jroelofs.com>
+Martin Storsjö <martin@martin.st>