Add backwards compatible parameter for server.domain.

We don't want to change the interface for the user at this point but do
want to start thinking about the future of the options.  Thus, we will
have both parameters until we start working on 2.x.
Make tests pass-ISH.

Trying to get to a successful build so we can start moving forward
again.  Not sure yet what is wrong with the two failing tests but may
just remove them as the application runs again.