Upload changes, and some config changes

Changes to consistently handle docx and pdf files.  Also, updated the
config files.