Upgrade to JDK7

This fixes #668