HLS Merge Changes

The dist/SWF is the result of the hls-seeking branch merge.