Updates to fix some dao needs.  Also half the subsumption code is here
Merge remote-tracking branch 'origin/master'