Removed extra spaces & pipe from default separator
Updated to reflect changes to default separator.
Fixed a small oversight.
.mailmap: map @ShadowNinja correctly.

Preferred address asked at #Limnoria.
Merge pull request #683 from Mkaysi/patch-1

.mailmap: map @ShadowNinja correctly.
Merge pull request #682 from monodemono/testing

Removed extra spaces & pipe from default separator
Merge remote-tracking branch 'upstream/testing' into testing