picks no longer contain the gain
fix simulation script
fix the stub reports script
Merge branch '2.x/develop' of github.com:melvinmt/sharpefolio into 2.x/develop