Make watch button visible
Refactor socially-related routes into their own controller
Refactor annotation-related actions into their own controller/spec
Add support for blocking/unblocking users to the social DAO