i3
hopefully cmus_title is now stable

Merge branch 'master' of github.com:twist/rc_lib

Conflicts:
	rc/i3/conkyrc