preliminary work on building 3 tables
Merge branch 'dev' of https://github.com/openfisca/openfisca into dev
Instructions for @bouxtehouve
Merge pull request #248 from benjello/dev

Dev