Completes users_controller_spec andcleans up lingering template_ and active_ files