Use hh/better-annotations branch of bookshelf
Updated bookshelf config to use latest opscoderl_wm