updates for 2.0 and for managing ejs properly
Merge pull request #5 from dbashford/master

updates for 2.0 and for managing ejs properly