Fixed taxonomy return_format = object

Taxonomy field did not work and was returning null when return_format
was set to object. This was because no taxonomy was being passed to the
get_terms() function, so was defaulting to 'category'
Reset other changes

Reset other changes so i can create a branch for each
Fixed taxonomy return_format = object

Taxonomy field did not work and was returning null when return_format
was set to object. This was because no taxonomy was being passed to the
get_terms() function, so was defaulting to 'category'
Merge pull request #358 from taylormsj/taxonomy-field

Fixed taxonomy return_format = object