Minor changes and beautification

First of all: Is DataFactoids.java still needed? FactoidManager is the
thing that is actually handling that, right?

Added: more keywords to look for factoids.