Automorphism Groups of Torsion-free Groups of Rank 2 and Torsion-free Groups with Two Automorphisms