Minor fix in script
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