Merge pull request #270 from jsantoul/dev

Cleaned the presta fam to ease reading
Merge branch 'dev' of https://github.com/openfisca/openfisca into dev