Fixed Merge commits and added Bokeh stuff to GFTunnelLayer