cleanup organization
Merge branch 'master' of https://github.com/kingbobthegreat/glowing-duck with local copy
infobox and all url encodings