shamelessly add myself to AUTHORS
Merged conflict

and yes, I should pull first, and I should have and rebased as well.