fixes in awesome theme
fixes in conky theme
extra settings
Merge branch 'master' of github.com:ccaballero/settings

merge