updated conky
Merge branch 'master' of https://github.com/amdi/macdotfiles

Conflicts:
	.conkyrc