longer sim time and better collision avoidance.
Merge branch 'master' of https://github.com/mycal-tucker/air-traffic-simulation