fix java 1.6 compatibility, and make sure it's maintained in the future
Fix extra java 1.6 failures... that only happen with -source 1.6.  Go figure.
Merge pull request #132 from joshuawarner32/master

fix java 1.6 compatibility, and make sure it's maintained in the future