Remove some VFs from Project & modify another to not use extra queries but a Join instead (& limit to just when-needed)
Merge branch 'master' of git://github.com/flavour/eden
Merge branch 'master' of git://github.com/flavour/ifrc