Minor fix in script
Merge pull request #158 from bouvard/dev

Dev
Minor typo
Merge branch 'dev' of https://github.com/openfisca/openfisca into dev

Conflicts:
	src/scripts/aggregates_all_years.py
Merge pull request #160 from benjello/dev

clean sync
Merge pull request #162 from bouvard/dev

Dev
add adoption in franc data
Merge pull request #163 from benjello/dev

add adoption in france data
upgrading inequality plugin
Merge pull request #166 from benjello/dev

upgrading inequality plugin
amounts.h5
Merge branch 'dev' of https://github.com/openfisca/openfisca into dev
test inequality