ean up some broken include file ordering
Merge branch 'master' of https://github.com/opencog/opencog