Merge pull request #15 from rentonsa/master

LIB001-438 Make highlighting configurable
LIB001-463 Embed Video/Audio into Skylight