More stuff for Cecilia
Merge pull request #221 from benjello/dev

More stuff for Cecilia
Merge branch 'dev' of https://github.com/openfisca/openfisca into dev