Commits from laptop for MacroScheduler and related files
Merge remote-tracking branch 'origin/autoheli-dev' into autoheli-dev
Partially working Waypoint behavior