added some derivated data to the merged data set and cleaned the data
Merge branch 'master' of https://github.com/dkbhowell/BigDataProject