Merge remote-tracking branch 'upstream/trunk' into trunk
Ignore the usual
Prepare to refactor static methods into object by reducing visibility of methods and removing duplicate tests.
Push static method into instance.
Inject configuration through constructor.
Inlined static method
Store instance in field, ready to be injected
Move nested class to top level, allowing more flexibility about reuse.
Push method into ArchiveGuesser, aiming to potentially extract a common interface
Merge branch 'trunk' of github.com:itstechupnorth/creadur-rat into trunk
Merge branch 'trunk' into gsoc