Merge pull request #1 from EricBoersma/master

Getting the changes to you.
Fixes the index
Merge pull request #8 from grant-m-avery/master

Deletes the index