Merge pull request #23 from nathanathan/develop

Merge with modilabs
Taking out gh org name for modilabs merges
Merge pull request #24 from nathanathan/develop

Reverting validate wrapper and condensing multiline empty labels.
Removing Validate warnings message when there are no warnings
condense all labels with whitespace
removed table-list test, rely on widget.xls test
updated dict structure for tests
normalize text line endings across platforms
normalize text
Merge pull request #68 from UW-ICTD/master

A couple bug fixes + autoplay column
Merge branch 'uw-master'

* uw-master:
  normalize text
  normalize text line endings across platforms
  updated dict structure for tests
  removed table-list test, rely on widget.xls test
  condense all labels with whitespace
test for IndexError on cascade forms with no cascade sheet
fix for IndexError, return appropriate pyxform exception
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
Merge pull request #70 from modilabs/index-error-cascade

Index error cascade #69
set pyxform.__version__
bump pyxform version in setup
travis runs under virtualenv, no need of sudo pip

Conflicts:
	.travis.yml