Merge pull request #12 from Pyke75/master

New criteria
Merge pull request #13 from Pyke75/master

new criteria for opt_pension
Including dsiabling asf
Ongoing work
fixing bugs
Ready for optimal pension run
Modified to conform to the refactoring of openfisca
Refactoring and inclusion of disable api
Fixing disabld_api and maxiter