ejs update as of 10/26/2014

from master as of tonight