Track parameters renamed and fix for KeyError caused by lazy inheritance
Merge branch 'master' of github.com:FlightDataServices/FlightDataAnalyzer