updated to java 7
Merge pull request #28 from gdfm/java7

updated to java 7
Merge pull request #6 from yahoo/master

from main stream