Updated conkyrc

Added colors
Added mail count
Nicer play sign when mpd is playing
Merge branch 'master' into elmo
Don't need the battery indicator on desktop.