Merge branch 'master' into dec_flag

Conflicts:
	setup.py
Merge pull request #285 from wasade/dec_flag

Dec flag
Merge branch 'dec_flag_light_parser' of github.com:adamrp/biom-format into dec_flag_light_parser

Conflicts:
	setup.py