Updated tests to pass now that we have Devise configured
Merge branch 'exercise_8_completion' into exercise_9_completion
Updated controller spec for new state machine rules