Remove erroneous trailing comma.
Remove unneeded parentheses.
Use unicode strings in enumerations.
Merge remote-tracking branch 'openfisca/v0.5dev' into v0.5dev