Merged .new file versions with their originals

Also updated context.js, intention.js, and content.min.js