Merge branch 'revisit-redux' into qa

Conflicts:
	modules/src/main/java/org/archive/modules/writer/WARCWriterProcessor.java
Merge branch 'qa' of git://github.com/vonrosen/heritrix3 into qa
Merge branch 'revisit-redux' into qa
Merge branch 'qa' of git://github.com/vonrosen/heritrix3 into qa
Merge branch 'qa' of git://github.com/vonrosen/heritrix3 into qa
Merge branch 'extract-html-no-mimetype' into qa
Merge branch 'qa' of git://github.com/vonrosen/heritrix3 into qa
Merge branch 'master' into qa
Merge branch 'qa' of git://github.com/vonrosen/heritrix3 into qa
Merge branch 'aitfive-39' into qa
Merge branch 'qa' of git://github.com/vonrosen/heritrix3 into qa
Merge branch 'qa' of git://github.com/vonrosen/heritrix3 into qa
Merge branch 'qa' of git://github.com/vonrosen/heritrix3 into qa
rename AMQPCrawlLogFeed fields to match James's names in druid (looks like there's no way to translate)
Merge branch 'qa' of git://github.com/vonrosen/heritrix3 into qa
Merge branch 'aitfive-39' into qa