CS changes. Get rid of a double serialization in Vocabulary::update(). Don't unserialize fields and newfields until after merging the two arrays, so we only have to do one unserialization. Fix __get(). The Vocabulary class now passes all tests.
CS changes. Get rid of a double serialization in Vocabulary::update(). Don't unserialize fields and newfields until after merging the two arrays, so we only have to do one unserialization. Fix __get(). The Vocabulary class now passes all tests.

git-svn-id: d0e296eae3c99886147898d36662a67893ae90b2@3858 653ae4dd-d31e-0410-96ef-6bf7bf53c507

dragonmantank/Habari,dragonmantank/Habari,dragonmantank/Habari