added conky stuff
Merge branch 'master' of github.com:JeffreyMilner/arch