AP_NPS: just saving work for now -- need to interactive rebase later
Just saving my place again... have to go work on geofence awhile.
Still just saving: fixed a couple of typos and errors.