Updated both files; still testing approaches to integrals, last update was overly optimistic
Updated canopy_model.py with the integral procedure from scipy, it needs further testing but seems to be within the correct order of magnitude