Linkify the things we have that others don't
Merge pull request #555 from alex/better-index

Linkify the things we have that others don't