CORRECTING ERROR - the previous commit had an error where the early use of the merge function to convert the activity labels did order the data in an undesired fashion. This commmit fixes it by changing the labels later in the script. It also makes use of the 'merge' and 'dcast' functions to make building the tidy dataset easier.