Small updates to the user model and flesh out the user spec

No need to call `.all` in the scope lambda.
Use update_attributes from within the User model.
Flesh out the user spec to test the scopes and the `User#activate` instance method