Combine indices and check them both intelligently#75

glesica wants to merge 7 commits intomastercode-for-montana/nonprofit-data:masterfrom

combine-indexcode-for-montana/nonprofit-data:combine-indexCopy head branch name to clipboard