Merge branch 'master' into steele

Conflicts:
	conkyrc
Merge branch 'master' into steele