Use Java 7 again

All of the student now have Java 7 working.  We're not quite to Java 8, but it's an improvement.