Merge pull request #13 from ianphs/ui2

extreme simplification
correct the mishandling of lane: <timekeepersPresent>
remove times-edit from the dialog, and repair regressions