Support for adding captions to the time line (rebased).
Re-added caption class (lost in rebasing accident).
Merge branch 'captions-rebase'
Updated core, changed standards version to gnu++0x, fixed various compiler warnings.
Document caption options, fixed height offset, added caption-offset option (0 to centre).