inject.js stuff (committed so I can switch computer)
Annotations are properly linked to elements now
Merge remote-tracking branch 'origin/shep'