Updated analytics code to fit MIT version, changed datastore indexes
Merge pull request #44 from karuto/mit-dev

Updated analytics code to fit MIT version, changed datastore indexes