simplify bookmarks routes
add user to bookmark factory
modify bookmarks controller spec to account for current user
remove ghetto debugging from bookmarks controller
Merge pull request #1 from gadtfly/master

Fix that `bookmarks#update` spec