Merge branch 'master' of https://github.com/artsy/Eidolon into new_user