Add missing callback URLs
Reformat zippy responses to do the right thing (bug 948240)

https://bugzilla.mozilla.org/show_bug.cgi?id=948240
Add missing callback URLs
Merge remote-tracking branch 'mozilla/master' into 948240-reformat-response

Conflicts:
	samples/zippy-basic.py
Merge pull request #190 from davidbgk/948240-reformat-response

Reformat zippy responses to do the right thing (bug 948240)