JDK 6 is no longer supported on Travis, thus test on JDK 7 and OpenJDK 7.
Merge update to documentation done through GitHub web interface