Change Java version back to 1.6

This should allow us to test with 1.6 and 1.7.