Update gitignore (pyc files), and change template_expand to file_template_expand
Merge branch 'master' of github.com:Normation/ncf