combine matlab tests into a test harness; minor bug fixes and refactoring
Merge branch 'master' of github.com:pcmoritz/traffic-project