Zeroed total_fb_matoms in estimators.c
Merge branch 'macro' of https://github.com/agnwinds/python into macro
log lines in photo_gen.c