I had previously set up a steam account for testing purposes when the initial steam client was released. Is there a way that I can remove the login info for that account and migrate my main over to steam?

Alternatively, and preferred, is there away to have both of my accounts able to be launched from steam?