Merge pull request #156 from Floobits/refactor

Refactor
update the default host from settings if possible.  This info really should be part of context, but that causes trouble.