added conf.js back to .gitignore
testing if conf.js updates in github