New plotting and data management functions
Merge branch 'master' of https://github.com/sdrendall/hcccAnalysis

Updated Conditions file
minor changes, merged in new Conditions file