Updated Data.h to reflect Data.cc
Merge branch 'master' of https://github.com/mganger/Balloon-2014
Merging, please look over your shoulder.