UW-ICTD/pyxform merge

* uw/master:
      Fixing orx:meta element bug and adding new features for upcoming collect release.