Finished merging QGCVehicleConfig.ui, which I hadn't done properly last night. Things are now in a usable state again.