Switched settings.js and the addSites commented examples over to proper JSON.
Resolved merge conflicts.