fixed a bug with new collectors and annotators getting sent to server
Merge branch 'master' of github.com:danwinkler/stats-simple
Merge remote-tracking branch 'upstream/master'