Update .mailmap
Merge branch 'master' of github.com:FlightDataServices/FlightDataAnalyzer