um, fixes?
whoops
Merge branch 'master' of git://github.com/rfw/kobun

Conflicts:
	kobun/supervisor.py
	services/cannedreplies
	services/title