Plane: fixed up merge errors
Plane: fixed comma
Plane: removed extra log enum
Plane: removed duplicate log description
AP_AHRS: make estimate_wind() public

this avoids it linking into copter
Plane: call esimate_wind()
AP_Baro: _calculate can be private
Copter: disable direct tuning, we need accessors for this
AP_AHRS: don't allow get_velocity_NED() and get_relative_position_NED() without EKF

this avoids some linking issues, plus the functions are inaccurate
without EKF
AP_TECS: update for AHRS API change
AP_NavEKF: fixed init order warning
AP_InertialNav: fixed EKF version for new AHRS API
AP_AHRS: re-run update_trig() after EKF AHRS update
GCS_MAVLink: re-generate MAVLink headers
AC_AttControl: ACRO fixes
AC Acro and Sport: Angle limit code update
Copter: simplify get_angle_targets_for_reporting
AC_AttControl: rename most methods
TradHeli: integrate AttControl method name changes
Copter: integrate AttControl method name changes