added factors of geo.fill to routines which increment heating estimators
corrected a lot of values to use the filled volume rather than wind cell volume for microclumping
Merge pull request #129 from jhmatthews/clump_estimators

added factors of geo.fill to routines which increment heating estimators
fixed a merge conflixt
Merge branch 'matrix_test' of https://github.com/agnwinds/python into matrix_test