Rc merged

Merged #840 (https://github.com/PX4/Firmware/pull/840) & #790 (https://github.com/PX4/Firmware/pull/790).  Bench tested failsafe, standard 2x3, and 1x6 mode switch configurations.  Renamed mission_switch to loiter_switch and assisted_switch to easy_switch for consistency.