Make Metro display more similar to Metrobus, with upcoming trips consolidated to the right of the first trip. Closes #73.

Also clean up a lot of dead code, and remove "ARR" trains from screen.