Switched to a SearchIndex, so as to not collide w/ Search plugin
Merge branch 'searchindex'