back to old two paths
merging in neals

Merge branch 'master' of github.com:sociam/zooniverse-history