added reparametrizations for likelihood.py
Merge branch 'master' of github.com:apetri/CFHTLens_analysis

necessary,