fixed offsets
fixed r.json error: is not a dictionary

i could swear this was a dictionary on the pi. maybe an old version of requests?
test.py now proper, stuff
Merge branch 'master' of https://github.com/sonopard/PowerCounter

Conflicts:
	raspi/src/ppm.py