Java 7 fixes and CHANGELOG for 2.0 URI.
bumping version