Merged plane and copter code. Compiling OK. Untested in hardware.