Merge branch 'dev' of https://github.com/openfisca/openfisca into dev
Renaming various objects

files renamed to better reflect their function.
Merge branch 'dev' of https://github.com/openfisca/openfisca into dev
Factorizing methods in simulation.py
Merge pull request #241 from benjello/dev

build_survey updated
Merge branch 'dev' of https://github.com/openfisca/openfisca into dev
Cleaning of simulation. Work on 06_rebuild
Merge branch 'dev' of https://github.com/jsantoul/openfisca into dev