Fixed GBM api changes in python
More python renaming for GBM
Merge branch 'master' into grids