java 7
unused imports
ignore eclipse cruft
Merge pull request #1 from eevans/master

build errors (and other nits)