uw-ictd merge

- supports both the old and new xlsform cascades
- xlsx support among other features applied in the uw-ictd repo