branch test 2

Oliver - can you please take a look at the user_bookmarks_spec and the factory? 

I'm running into the issue with setting the owned_by_user factory up and could use an extra set of eyes.

Thanks!