Merge branch 'no-time-mod' into no-time-mod-pre-2.1

* no-time-mod:
  Add support for #EXT-X-KEY
  Add fixes from /u/hockeyanonymous
Fix indentation
Simplify key fix
Merge branch 'no-time-mod-pre-2.1' into no-time-mod

* no-time-mod-pre-2.1:
  Simplify key fix