All specs passing and everything's looking good
Merge branch 'taxonomies'