Fairly massive update to pom.xml