updated conky for desktop 1900x1080
Merge branch 'master' of http://github.com/Unknown-Anomaly/dotfiles

Merge of two dev enviroments that were not kept sync'd