*9002* Cleanup and testing for DB data parser
*9002* Fix controlled vocabulary installation
*9002* Tweaks from review
Merge pull request #219 from asmecher/9002-fix

*9002* Port fix for hard-coded CV IDs to master