Various fixes

Adjust to new version of openfisca/dev,
fixing min_vital,
Dealing with asf in bareme
Fixing conflicts