Don't index the corpus

Prevent the corpus data from being indexed.

This also includes the 0.16 changes since they don't seem to have made it to this repo yet.