implement collector methods (+ tests), start working on joins (wip)
Merge branch 'master' of git://github.com/flack/midgard-portable