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.