Various small fixes

Pull request include several smallish fixes I've been using over the few days:

- 7e1d51d 60 seconds for a socket to timeout is rather long - especially since we then retry the socket for a total of 15 minutes.
- 594ac9a is what should've been done in e101032.
- 0400e0c exit the CLI main method in a single place on success.
- 8282bca display errors in the right place.
- 1d41cec return existing instances in output on map create - this has the added benefit of preventing salt-cloud chucking an error code when running a map file where all nodes already exist (which I believe is not an error state).