These were our final changes
Merge branch 'master' of https://github.com/tomkentpayne/wireless_gps_tracking