Checking collections on update, adding test
Fixing conflict
Update bookmark_create.feature

Removing extra bits. I'll save 'em for later.
Update bookmarks_controller.rb

Touching file to cause Travis-CI to restart
Merge pull request #1649 from scottsds/issue_3083_fixed

Checking collections on update, adding test