set alternatives to make the installed version of oracle java take precedence over gcj and others
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge pull request #1 from cpenner461/master

setting alternatives