Update RRRR to v3 of datafile

Untested with new stops file
Merge branch 'master' of https://github.com/bliksemlabs/BliksemWP.git
After debugging all the fixes, reverted some things to make it all work again