Update conky wireless dev name
Merge branch 'master' into steele