initial Java 7 conversion of proejct + some minor tidying
Merge pull request #7 from karianna/master

Java 7 idioms + some minor tidying