Merge branch 'master' of git://github.com/biocore/biom-format into issue-277

Conflicts:
	biom/table.py

Fixes #277