added strict flag to collapse methods
fixed conflicts
Merge branch 'master' of github.com:biom-format/biom-format into cat_by_func_path_error

Conflicts:
	python-code/biom/table.py
Merge pull request #108 from wasade/cat_by_func_path_error

Cat by func path error