Merging to pull master changes and change name of refine.py gps variable
This is prior to merging MR !105. To pull changes that have been made to locklost master since MR was initiated and change name of refine.py variable gps to max_time.
This is prior to merging MR !105. To pull changes that have been made to locklost master since MR was initiated and change name of refine.py variable gps to max_time.