* Remove superfluous comments and update ordering * Fix pylint issues
* Fix incorrect import * Create own discovery service * Fix tests * Fix hdmi_cec bad import