Reverted ugly hack committed by accident
Typo
First stab at gpsd / rvi integration. Ugly code. Non functional