false manip do not merge
Merge branch 'dev' of https://github.com/openfisca/openfisca into dev
Merge branch 'dev' of https://github.com/openfisca/openfisca into dev
Unstable, unready. Need more clarification before merging
Merge branch 'dev' of https://github.com/openfisca/openfisca into dev
Merge branch 'dev' of https://github.com/openfisca/openfisca into dev
Work on pre_proc conversion
Merge pull request #196 from jsantoul/dev

Work on pre_proc.py and foyer05.py WIP.
Starting desindex
Fixing datatable

But set_config takes forever
Merge pull request #197 from benjello/dev

Fixing erf import
Merge pull request #195 from bouvard/dev

Dev
Fixing desindex and .gitignore
Merge branch 'dev' of https://github.com/openfisca/openfisca into dev
Convertion of the file 01pre_proc
2nd commit to update local repo.
Merge pull request #198 from jsantoul/dev

Converting 01pre_proc
Working on erf datatable and fixing issue for cecilia
Resolving conflicts and doc in cecilia
Fixing datatable