stash popped and brought up some old stuff I didnt want. Had to clean up
Changed the TrellisTempCtrl to not pre-load plants - NewPlant contact freq
Merged master into contactFrequency
Forgot to hit save for the conflicts, oops
Cleaned some stuff
Merge pull request #69 from gavlu/contactFrequency

Contact frequency