Different version
Merge branch 'master' of https://github.com/HIPS/optofit
Merged fixed pMCMC, tweaked learning parameters
merging
Merge branch 'atucker-master'