Made jokes a list instead of just a single object
Converted from json to yml for the jokes list. Because it looks nicer.
Merge branch 'master' into unstable