Changes for new calibration in APM 3.0 (Re: https://github.com/diydrones/MissionPlanner/issues/38), and change in some of the serial timeouts

Change so Waypoints are the same across maps, and offline waypoints get appeneded to the end of the MAV's waypoint list on connect