Created a combined sources file so people can pull into external projects. fixes #287
Updated player options to use component options_ settings and mergeOptions.
Stopped big play button from showing on ended.
Updated component children adding to allow no name, id, or el
Updated dispose to support children without the dispose method
resolving conflicts with upstream merge