Adding the correct view model definition for GridPlot
Merge branch 'master' of github.com:ContinuumIO/Bokeh