Have activate user return json

- Change activate user from admin controller to return json
- Test that it returns json
- Remove unnessary test from log_out spec

This commit was created so that when you activate a user through the api
it returns a json response.
Merge pull request #3031 from oblakeerickson/activate_return_json

Have activate user return json