Merge branch 'issue-290' of git://github.com/ElBrogrammer/biom-format into issue-290

Conflicts:
	biom/table.py
BUG: Fix non-existant variable name

Thank you very much @ElBrogrammer
Merge branch 'master' of git://github.com/biocore/biom-format into issue-290

Conflicts:
	biom/table.py
	tests/test_table.py