Merge branch 'master' of https://github.com/artsy/eidolon into location