Redo Nextbus

Redoes the nextbus JSON structure. Also fixes issue #15.