Reformatted files to match what I'm used to.  Also, allow users to use $HOST in the discoveryUrl.