Fixing a bug when setting ports and hosts.

OAuth needs the hostname to include the port number. The approach uses isn't foolproof, but it's a start.
Merge branch 'master' of https://github.com/wollardj/mandrillctl