* merge templates
* fix merge issues
* fix bad merge
* adding snmprec for x11 variant
* better description for psu and vbat sensors + update overview
* oid name
* adding snmp_bulk: false back in so as to not break older hardware
* make atenpdu more specific so it does not match supermicro-bmc devices
* update x10 variant json
* updated supermicro logo and fixed data json
* updated supermicro logo
* json and snmprec got out of sync somehow
