fixed it
Merge branch 'fog-dns' of https://github.com/bighappyface/origin-server into fog-dns