added some comments
conflict
more merging from chris and rob

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