Import docx

Importing Brad's DOCX branch so that Hugh (and I) can test more easily.