Adding support for multisites, and commenting out an extension conflict. This will still be required for a fresh 3.1 installation of the module.