ENH: add_*_metadata -> add_metadata
Commiting for being able to merge master
Merge branch 'master' of git://github.com/biom-format/biom-format into sort_order
Merge branch 'master' of github.com:biocore/biom-format into add_metadata
ENH: metadata_adder now calls things right
sort_*_order -> sort_order
Actually removing the functions
addressing @adamrp and @josenavas's comments
Merge pull request #328 from josenavas/sort_order

Sort order
Merge pull request #325 from wasade/add_metadata

ENH: add_*_metadata -> add_metadata
Merge branch 'master' into filtering

Conflicts:
	tests/test_table.py