starting tests
Merge branch 'master' into codecoverage
testing feeds#update
search controller tests (vimeo)
putting bookis back in