updated conkyrc for small resolutionj
Merge branch 'master' of https://github.com/mlsimpson/dotfiles