Merge pull request #159 from visionmedia/ejs and add test

Original commit message: Fixed infinite loop problem in parse for unescaped ejs