Update to Maven 3.1.1, and make some adjustments to the new version of Sisu that accompanies it