Rewrote data sources and measurements.
Merge branch 'master' of github.com:jesyspa/B3OMI-group-project-datastructures-2014
Cleaned up filenames.