Remove unnecessary before block in user controller spec and clean up whitespace in other specs.
Merge branch 'cleanup_specs'