Fix tabulation
Renaming for clarity
Merge pull request #15 from MalkIPP/master

Ipp work on eipp data
Minor refactoring
Changes to tke car of openfisca-survey-manager dependency