clean up and add some handy indexes
Merge pull request #19 from Sirupsen/clean-up-indexes

Clean up and add some handy indexes