Upgrade to Maven 3

I didn't test this at all except to run `mvn test`. Do you think that's sufficient and likely to work?