don't use X when using standard conky package
Merge branch 'master' of github.com:jblomo/dotfiles