TST: collapse tests are back, not yet passing again
Merge branch 'master' into collapse
collapse tests passing again..
MAINT: some cleanup of collapse...
pep8...
Merge branch 'master' of github.com:biocore/biom-format into collapse
MAINT: fixups, thanks @josenavas
MAINT: fixups, thanks @josenavas
Merge branch 'master' of github.com:biocore/biom-format into collapse

Conflicts:
	biom/table.py
	tests/test_table.py
MAINT: resolving constructor order changes
STY: pep8
Merge pull request #341 from wasade/collapse

Collapse