Added docstring to combine_flap_slat
Fixed combine_flap_slat test name.
Rudder Pedal now combines (1) and (2), added test.
Added Spoiler parameter combining spoilers 1 and 14 with test
Removed commented out code and re-enabled Initial Approach flight phase
Added TAWS Terrain Caution/Caution Terrain docstrings to avoid confusion
Spacing only.
Fixed KTIs with circular dependencies (renamed to Set)
Uncommented TestInitialApproach.
Added EventMarker combined parameter.
Merge branch 'master' of https://github.com/FlightDataServices/FlightDataAnalyzer

Conflicts:
	tests/derived_parameters_test.py