more tests for users_controller
feeds_controller bulk_happy test
Merge branch 'master' into users-spec