diff --git a/.travis.yml b/.travis.yml
index ab7023096e..bb0b3bf06c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -55,7 +55,7 @@ install:
   - cd ./doc/reference_data
   - echo "Attempting to checkout $REF_DATA_BRANCH branch"
   - if [ $(git branch -a --list *origin/$REF_DATA_BRANCH | wc -l) -eq 1 ] ; then
-      git checkout $REF_DATA_BRANCH;
+      git checkout origin/$REF_DATA_BRANCH;
     else
       echo "Using the master branch reference data";
     fi
diff --git a/doc/Tutorials/Columnar_Data.ipynb b/doc/Tutorials/Columnar_Data.ipynb
index 3d4c15d1fc..0faefc1857 100644
--- a/doc/Tutorials/Columnar_Data.ipynb
+++ b/doc/Tutorials/Columnar_Data.ipynb
@@ -190,7 +190,7 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "To select a particular storage format explicitly, supply one or more allowed datatypes:"
+    "Note these include grid based datatypes, which are not covered in this tutorial. To select a particular storage format explicitly, supply one or more allowed datatypes:"
    ]
   },
   {
@@ -820,8 +820,7 @@
    },
    "outputs": [],
    "source": [
-    "%opts HeatMap [show_values=False xticks=40 xrotation=90 aspect=1.2 invert_yaxis=True colorbar=True]\n",
-    "%opts Layout [figure_size=120 aspect_weight=0.5 hspace=0.8 vspace=0]"
+    "%opts HeatMap [show_values=False xticks=40 xrotation=90 aspect=1.2 invert_yaxis=True colorbar=True]"
    ]
   },
   {
@@ -832,6 +831,7 @@
    },
    "outputs": [],
    "source": [
+    "%%opts Layout [aspect_weight=1 fig_size=150 sublabel_position=(-0.2, 1.)]\n",
     "hv.Layout([macro.to.heatmap(['Year', 'Country'], value)\n",
     "           for value in macro.data.columns[2:]]).cols(2)"
    ]
@@ -916,17 +916,6 @@
     "While looking at the plots individually like this allows us to study trends for each country, we may want to lay out a subset of the countries side by side, e.g. for non-interactive publications. We can easily achieve this by selecting the countries we want to view and and then applying the ``.layout`` method. We'll also want to restore the square aspect ratio so the plots compose nicely."
    ]
   },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {
-    "collapsed": true
-   },
-   "outputs": [],
-   "source": [
-    "%opts Overlay [aspect=1]"
-   ]
-  },
   {
    "cell_type": "code",
    "execution_count": null,
@@ -935,7 +924,7 @@
    },
    "outputs": [],
    "source": [
-    "%%opts NdLayout [figure_size=100] Scatter [color_index=2] (cmap='Reds')\n",
+    "%%opts NdLayout [figure_size=100] Overlay [aspect=1] Scatter [color_index=2] (cmap='Reds')\n",
     "countries = {'United States', 'Canada', 'United Kingdom'}\n",
     "(gdp_curves * gdp_unem_scatter).select(Country=countries).layout('Country')"
    ]
@@ -955,7 +944,7 @@
    },
    "outputs": [],
    "source": [
-    "%%opts Layout [fig_size=100] Scatter [color_index=2] (cmap='Reds')\n",
+    "%%opts Scatter [color_index=2] (cmap='Reds') Overlay [aspect=1]\n",
     "(macro_overlay.relabel('GDP Growth', depth=1) +\\\n",
     "macro.to.curve('Year', 'Unemployment', ['Country'], group='Unemployment',) +\\\n",
     "macro.to.curve('Year', 'Trade', ['Country'], group='Trade') +\\\n",
diff --git a/doc/nbpublisher b/doc/nbpublisher
index bab99a616f..4759e32897 160000
--- a/doc/nbpublisher
+++ b/doc/nbpublisher
@@ -1 +1 @@
-Subproject commit bab99a616f61781f3de828e3165bb88062d87128
+Subproject commit 4759e32897bf7821f844a0ede68ba144bb268498