Fix two bugs related to Taxon entities reported by client
Merge branch 'fix-taxon-admin-page-errors'
Merges bug fixes for #15 and #16 from Squishymedia.

According to Squishymedia, closes #15 and closes #16.