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
Updated version strings to 1.1.2.
Merge pull request #109 from jrrideout/1.1.2-prep

Updated version strings to 1.1.2.
Updated version strings from 1.1.2 to 1.1.2-dev.
Merge pull request #110 from jrrideout/1.1.2-postrelease

Updated version strings from 1.1.2 to 1.1.2-dev.