fixing simulation/bypass flags from last commit
Merge branch 'master' of git@github.com:camsys/onebusaway-nyc.git