Moved more calculation functionality into kenyacore
* Updated to latest kenyadq to get new report