Fixed errors I've made while rewriting template and removed auto-merged file from @mde's updated ejs index module
Fixed errors I've made while rewriting template and removed auto-merged file from @mde's updated ejs index module

cnwhy/ejs,rpaterson/ejs,xanxiver/ejs,tyduptyler13/ejs,kolonse/ejs,insidewarehouse/ejs,insidewarehouse/ejs,mde/ejs,TimothyGu/ejs-tj,zensh/ejs,operatino/ejs,jtsay362/solveforall-ejs2,zensh/ejs,mmis1000/ejs-promise,cnwhy/ejs,TimothyGu/ejs-tj,kolonse/ejs