rosie: remove format=json from URL.

Also some tidy up.
Merge branch 'master' into 459.rosie.format=json
Merge branch 'master' into 459.rosie.format=json
Fix typo.
Merge branch 'master' into 459.rosie.format=json
Merge pull request #479 from matthewrmshin/459.rosie.format=json

rosie: remove format=json from URL.