Move hbp vocabulary into consistent place
Merge pull request #31 from eile/move

Move hbp vocabulary into consistent place