updates to Data class to fix programming errors
Merge branch 'master' of https://github.com/mganger/Balloon-2014

Conflicts:
	slave/src/Data.cpp