Bug fix
Merge branch 'master' of https://github.com/rmamba/pyNmea-RaspberryPi

Conflicts:
	gpsd.py