Finalise EchoPet plugin support

Move functionality into "isEchoPet" utility.