Issue #45: changes for Ribbon upgrade
Issue #45: changing host name for server back to localhost
Merge pull request #48 from Netflix/issues/45

Pull request to merge issue branch issues/45