tidying up jokes#4

Open

dan-waters wants to merge 2 commits intousmanatron:masterfrom

dan-waters:master

Commits on Apr 22, 2015

tidying up jokes
dan-waters
committed

Commits on Apr 27, 2015

Using api to correct name
dan-waters
committed