Phase Diagram of a Geometrically-Frustrated Triangular-Lattice Antiferromagnet in a Magnetic Field Journal January, 2011