changes to calc_weights and aggregatepreliminary to accommodate more options in LAE User report target grade
cleanup, push version
Merge branch 'master2'