Merge pull request #390 from Flamenco/master

Initial support for annotations (links, etc.)
Merge remote-tracking branch 'mr_rio/master'
Initial c2d support