Updates on faggotry.
Merge branch 'master' of https://github.com/nol888/kobun

Conflicts:
	services/djinn
	services/wolframalpha