Cleaning up the candidate extractor
Switch to Java 7
Fix broken test
Merge branch 'master' into issue-110-exclude-containers
More cleaning up thanks to Java 7