VArious fix. Work on erf
Merge branch 'dev' of https://github.com/openfisca/openfisca into dev
Fix minor bug
Solve conflicts and fix #178
Merge pull request #179 from benjello/dev

Minor bugs and psa