Yeah, we don't need this
Check the host is set everywhere
Merge pull request #14 from theodi/feature-fix-all-the-things

Fix all the things