changes on laptop
Merge branch 'master' of https://github.com/DCully/carputiem
Combining changes on Pi with changes on laptop to speed development
fixed bugs, back to pi