extended waypoints; bug fix in static matrix generation where routes had repeated links; assert for scaled incidence matrices; some refactoring
Merge branch 'master' of github.com:cathywu/synthetic-traffic