Fixing orx:meta element bug and adding new features for upcoming collect release.
Merge pull request #25 from UW-ICTD/develop

Fixing orx:meta element bug and support for new Collect features
Merge remote-tracking branch 'uw/master' into uw-merge

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

Conflicts:
	pyxform/tests/xls2json_tests.py
Merge pull request #73 from modilabs/uw-merge

UW-ICTD/pyxform merge