Clean up ejs files and add keys.js to gitignore
Fix merge conflicts