improved video search and annotation
Merge branch 'master' of https://github.com/visym/bobo