Feature lift hostname

@rickychilcott I think I've fixed the tests — we'll see what Travis comes back with. I couldn't figure out how to add this commit to your PR so I made a new branch with a new PR.