Parnic:
	- - Added mailmap to alias a couple of users correctly.
