Updated conky output on bar, wallpaper, colors, etc.
Added colors, changed colors, changed conky output on bar, changed wallpaper, etc.
Merge branch 'master' of https://github.com/cjohnson714/dotfiles