ENH: :cry:
ENH: :cry:
TST: checking output format
Merge branch 'master' of github.com:biocore/biom-format into issue_367

Conflicts:
	biom/interfaces/optparse/output_handler.py
Merge pull request #376 from wasade/issue_367

Issue 367