The Massive Star Population of Cygnus OB2