Small changes to debug
GPS no longer hangs the program. It reads points every 5 seconds or so. If the gps dies, it'll wait for 5 seconds and then kill gps reading forever
Messy merge
Merge branch 'master' of https://github.com/mganger/Balloon-2014

Conflicts:
	slave/src/Data.cpp
	slave/src/src.ino