Split .conkyrc into two files with different colors, and updated .scripts/statusbar
Changed full.png to smiley.png in wmfsrc
Merge branch 'master' of https://github.com/kallgren/dotfiles