Make conky slightly more compact
Merge branch 'master' of github.com:quietfanatic/dotfiles
Tweak the PS1 string