Fixed conky path.
Merge branch 'master' into gondwana