Merge pull request #28 from dgageot/master

FIX #27 Unable to read .java-version files that contain carriage returns
grep 'java version' strings to extract the java version
Merge pull request #29 from ohneda/modify-java-add

Can't add JDKs when _JAVA_OPTIONS variable is set