Add indexes to user-supplied annotations.
Merge branch 'master' of github.com:arq5x/gemini