Update Java to 7u21
Merge pull request #14 from scottjg/upgrade-java

Update Java to 7u21