updated gitignore to avoid conf to be pushed
Merge branch 'master' of https://github.com/toriijs/torii.js