Consolidated generate commands. Tests passing.
Minor comment change
Cleaned up the generation code. Tests passing. May need to change the mtime query to include new documents, as new imported documents with an old mtime won't be generated.