Add more indices and cleanup code a bit to make it easier to add functions for rethinkdb to call.
Add more indices and cleanup code a bit to make it easier to add functions
for rethinkdb to call.

materials-commons/materialscommons.org,materials-commons/materialscommons.org,materials-commons/materialscommons.org,materials-commons/materialscommons.org,materials-commons/materialscommons.org