adding in _ as an appropriate server name character
switching the order of the _ and -
adding in a blank string as the default for the org
trying the ./ hack
reverting back to the url scheme
Merge pull request #6 from rackops/circletesting

Circletesting