Add the activate account step to the verified workflow.

* Changing approach such that email activation is not a step.
* Removing stale line of code.

@wedaly @dianakhuang @rlucioni 
Good call. This probably was duplicated when I rebased.