Fixes all of the java 1.6 vs 1.7 problems
Merge pull request #1 from lembang/scrubCodeFix

Fixes all of the java 1.6 vs 1.7 problems