Update version to 3.1-SNAPSHOT
Switch tests to use hamcrest matchers, and formatting
Formatting, comments, and convention changes