Fixing GridPlot and grid_plot example
Merge branch 'master' of github.com:ContinuumIO/bokehjs