Fix commit history

This fixes the messed up history @werdyl and I made yesterday, where we were both committing using my credentials. Hopefully I managed to get all the commits that Edward made attributed correctly to him.

The history looks slightly messed up now, but the code is still all in order and now attribution is proper.