Merge basic and two-factor setup

This change simplifies and merges the instruction for 
basic and two-factor authentication since they now
work basically the same.

Let me know if you want me to make any further changes.