Fix samholmes/EJS.tmLanguage#10 and include afram's patch for .tmLanguage escaping