Updated GPS and Master code

Updated code to get local and remote lock working, corrected pin
numberings GPS code commented out as WIP