diff --git a/.travis.yml b/.travis.yml
index 90962e4ff..dcc06f8bd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -158,13 +158,15 @@ jobs:
         - doit archive_project --name $DIR
         - anaconda-project prepare --directory $DIR
         - source activate $DIR/envs/default && pip install pyctdev
-        - conda install -y -c pyviz/label/dev "nbsite>=0.6.5" holoviews sphinx_pyviz_theme selenium phantomjs lxml nomkl
+        - which holoviews || conda install holoviews # Avoid clobbering an installed hv
+        - conda install -y "pyviz/label/dev::nbsite>=0.6.5" sphinx_pyviz_theme selenium phantomjs lxml nomkl
         - doit build_project --name $DIR
       after_success:
         - git config user.email "travis@travis.org"
         - git config user.name "travis"
         - mv ./doc/$DIR ./tmp
         - git fetch https://github.com/$TRAVIS_REPO_SLUG.git evaluated:refs/remotes/evaluated
+        - git diff
         - git checkout evaluated || travis_terminate 1
         - if [ -e  ./doc/$DIR ]; then rm -rf ./doc/$DIR; fi
         - mkdir ./doc/$DIR
diff --git a/attractors/anaconda-project.yml b/attractors/anaconda-project.yml
index 493d5d31f..d3c0b893f 100644
--- a/attractors/anaconda-project.yml
+++ b/attractors/anaconda-project.yml
@@ -10,6 +10,8 @@ labels:
 channels:
   - pyviz
 
+user_fields: [labels, skip, maintainers]
+
 packages: &pkgs
   - python=3.7
   - notebook=6.0
diff --git a/bay_trimesh/anaconda-project.yml b/bay_trimesh/anaconda-project.yml
index 756d25db8..b919c8fb0 100644
--- a/bay_trimesh/anaconda-project.yml
+++ b/bay_trimesh/anaconda-project.yml
@@ -7,6 +7,8 @@ labels:
   - geoviews
   - datashader
 
+user_fields: [labels, skip, maintainers]
+
 channels: []
 
 packages: &pkgs
diff --git a/boids/anaconda-project.yml b/boids/anaconda-project.yml
index bba625256..7da7f3263 100644
--- a/boids/anaconda-project.yml
+++ b/boids/anaconda-project.yml
@@ -7,6 +7,8 @@ maintainers:
 labels:
   - holoviews
 
+user_fields: [labels, skip, maintainers]
+
 channels: []
 
 packages: &pkgs
diff --git a/census/anaconda-project.yml b/census/anaconda-project.yml
index 90658000b..ba4a7e05f 100644
--- a/census/anaconda-project.yml
+++ b/census/anaconda-project.yml
@@ -7,6 +7,8 @@ labels:
   - datashader
   - geoviews
 
+user_fields: [labels, skip, maintainers]
+
 channels: []
 
 packages: &pkgs
diff --git a/datashader_dashboard/anaconda-project.yml b/datashader_dashboard/anaconda-project.yml
index 7553b7794..6e9e9d105 100644
--- a/datashader_dashboard/anaconda-project.yml
+++ b/datashader_dashboard/anaconda-project.yml
@@ -10,6 +10,8 @@ labels:
   - datashader
   - panel
 
+user_fields: [labels, skip, maintainers]
+
 channels:
   - conda-forge
   - nodefaults
diff --git a/doc/conf.py b/doc/conf.py
index af982ab6d..cb53079fb 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -41,16 +41,9 @@ def gallery_spec(name):
         spec = yaml.safe_load(f)
     default = list(spec['commands'].values())[0]
     url_name = name.replace('_', '-')
-    if 'notebook' in default.keys():
-        deployment_urls = [
-            f'https://{url_name}.pyviz.demo.anaconda.com/notebooks/',
-            f'https://{url_name}-notebooks.pyviz.demo.anaconda.com/notebooks/',
-        ]
-    else:
-        deployment_urls = [
-            f'https://{url_name}.pyviz.demo.anaconda.com/',
-            f'https://{url_name}-notebooks.pyviz.demo.anaconda.com/notebooks/',
-        ]
+    deployment_urls = [
+            f'https://{url_name}.pyviz.demo.anaconda.com',
+            f'https://{url_name}-notebooks.pyviz.demo.anaconda.com']
     description = spec['description']
     orphans = spec.get('orphans', [])
     if 'index.ipynb' in os.listdir(os.path.join('..', name)):
diff --git a/dodo.py b/dodo.py
index f2a502d70..c2b2f726e 100644
--- a/dodo.py
+++ b/dodo.py
@@ -210,6 +210,7 @@ def archive_project(root='', name='all'):
             spec.pop('created', '')
             spec.pop('skip', '')
             spec.pop('orphans', '')
+            spec.pop('user_fields', '')
 
             # commands and envs that users don't need
             spec['commands'].pop('test', '')
diff --git a/euler/anaconda-project.yml b/euler/anaconda-project.yml
index 27b4f0358..a3df7a62c 100644
--- a/euler/anaconda-project.yml
+++ b/euler/anaconda-project.yml
@@ -8,6 +8,8 @@ labels:
   - panel
   - holoviews
 
+user_fields: [labels, skip, maintainers]
+
 channels: []
 
 packages: &pkgs
diff --git a/gapminders/anaconda-project.yml b/gapminders/anaconda-project.yml
index dfd6975f9..b175e62fe 100644
--- a/gapminders/anaconda-project.yml
+++ b/gapminders/anaconda-project.yml
@@ -7,6 +7,8 @@ labels:
   - panel
   - channel_conda-forge
 
+user_fields: [labels, skip, maintainers]
+
 channels:
   - conda-forge
   - nodefaults
diff --git a/glaciers/anaconda-project.yml b/glaciers/anaconda-project.yml
index 275e00bf1..aee0c1de4 100644
--- a/glaciers/anaconda-project.yml
+++ b/glaciers/anaconda-project.yml
@@ -8,6 +8,8 @@ labels:
   - geoviews
   - datashader
 
+user_fields: [labels, skip, maintainers]
+
 channels: []
 
 packages: &pkgs
diff --git a/gull_tracking/anaconda-project.yml b/gull_tracking/anaconda-project.yml
index f6d48a1e7..05085388b 100644
--- a/gull_tracking/anaconda-project.yml
+++ b/gull_tracking/anaconda-project.yml
@@ -7,6 +7,8 @@ labels:
   - datashader
   - holoviews
 
+user_fields: [labels, skip, maintainers]
+
 channels: []
 
 packages: &pkgs
diff --git a/heat_and_trees/anaconda-project.yml b/heat_and_trees/anaconda-project.yml
index 72c0e07d2..47b49d498 100644
--- a/heat_and_trees/anaconda-project.yml
+++ b/heat_and_trees/anaconda-project.yml
@@ -12,6 +12,8 @@ labels:
   - geoviews
   - datashader
 
+user_fields: [labels, skip, maintainers]
+
 channels: []
 
 packages: &pkgs
diff --git a/hipster_dynamics/anaconda-project.yml b/hipster_dynamics/anaconda-project.yml
index 2f05ee9ed..14acaf76f 100644
--- a/hipster_dynamics/anaconda-project.yml
+++ b/hipster_dynamics/anaconda-project.yml
@@ -10,6 +10,8 @@ maintainers:
 labels:
   - holoviews
 
+user_fields: [labels, skip, maintainers]
+
 channels: []
 
 packages: &pkgs
diff --git a/iex_trading/anaconda-project.yml b/iex_trading/anaconda-project.yml
index e0f624eda..b15114546 100644
--- a/iex_trading/anaconda-project.yml
+++ b/iex_trading/anaconda-project.yml
@@ -14,6 +14,8 @@ labels:
 skip:
   - IEX_to_CSV.ipynb
 
+user_fields: [labels, skip, maintainers]
+  
 channels: [pyviz/label/dev]
 
 packages: &pkgs
diff --git a/landsat/anaconda-project.yml b/landsat/anaconda-project.yml
index a77a92643..421f2624a 100644
--- a/landsat/anaconda-project.yml
+++ b/landsat/anaconda-project.yml
@@ -7,6 +7,8 @@ labels:
   - geoviews
   - datashader
 
+user_fields: [labels, skip, maintainers]
+
 channels: []
 
 packages: &pkgs
diff --git a/lsystems/anaconda-project.yml b/lsystems/anaconda-project.yml
index 783ce9593..c4de4c195 100644
--- a/lsystems/anaconda-project.yml
+++ b/lsystems/anaconda-project.yml
@@ -6,6 +6,8 @@ maintainers:
 labels:
   - holoviews
 
+user_fields: [labels, skip, maintainers]
+
 channels: []
 
 packages: &pkgs
diff --git a/ml_annotators/anaconda-project.yml b/ml_annotators/anaconda-project.yml
index 4c534da62..7a11b06c6 100644
--- a/ml_annotators/anaconda-project.yml
+++ b/ml_annotators/anaconda-project.yml
@@ -7,6 +7,8 @@ labels:
   - holoviews
   - geoviews
 
+user_fields: [labels, skip, maintainers]
+
 channels:
   - pyviz/label/dev
 
diff --git a/network_packets/anaconda-project.yml b/network_packets/anaconda-project.yml
index 3f55a6a8e..cc744f986 100644
--- a/network_packets/anaconda-project.yml
+++ b/network_packets/anaconda-project.yml
@@ -8,6 +8,8 @@ labels:
   - datashader
   - networkx
 
+user_fields: [labels, skip, maintainers]
+
 channels: []
 
 packages: &pkgs
diff --git a/nyc_taxi/anaconda-project.yml b/nyc_taxi/anaconda-project.yml
index d9200a828..7453fc558 100644
--- a/nyc_taxi/anaconda-project.yml
+++ b/nyc_taxi/anaconda-project.yml
@@ -7,6 +7,8 @@ labels:
   - datashader
   - panel
 
+user_fields: [labels, skip, maintainers]
+
 channels: []
 
 packages: &pkgs
diff --git a/osm/anaconda-project.yml b/osm/anaconda-project.yml
index 577cc3c3f..09e72e2c7 100644
--- a/osm/anaconda-project.yml
+++ b/osm/anaconda-project.yml
@@ -6,6 +6,8 @@ maintainers:
 labels:
   - datashader
 
+user_fields: [labels, skip, maintainers]
+
 channels: []
 
 packages: &pkgs
diff --git a/portfolio_optimizer/anaconda-project.yml b/portfolio_optimizer/anaconda-project.yml
index 9d90009f1..02ac02bc9 100644
--- a/portfolio_optimizer/anaconda-project.yml
+++ b/portfolio_optimizer/anaconda-project.yml
@@ -8,6 +8,8 @@ labels:
   - hvplot
   - holoviews
 
+user_fields: [labels, skip, maintainers]
+
 channels: []
 
 packages: &pkgs
diff --git a/square_limit/anaconda-project.yml b/square_limit/anaconda-project.yml
index ee6f4df49..4c2bda946 100644
--- a/square_limit/anaconda-project.yml
+++ b/square_limit/anaconda-project.yml
@@ -6,6 +6,8 @@ maintainers:
 labels:
   - holoviews
 
+user_fields: [labels, skip, maintainers]
+
 channels: []
 
 packages: &pkgs
diff --git a/sri_model/anaconda-project.yml b/sri_model/anaconda-project.yml
index 7137edad0..6e5324386 100644
--- a/sri_model/anaconda-project.yml
+++ b/sri_model/anaconda-project.yml
@@ -8,6 +8,8 @@ labels:
   - holoviews
   - networkx
 
+user_fields: [labels, skip, maintainers]
+
 channels: []
 
 packages: &pkgs
diff --git a/uk_researchers/anaconda-project.yml b/uk_researchers/anaconda-project.yml
index 280776a3b..7f9458e3c 100644
--- a/uk_researchers/anaconda-project.yml
+++ b/uk_researchers/anaconda-project.yml
@@ -6,6 +6,8 @@ maintainers:
 labels:
   - datashader
 
+user_fields: [labels, skip, maintainers]
+
 channels: []
 
 packages: &pkgs
diff --git a/voila_gpx_viewer/anaconda-project.yml b/voila_gpx_viewer/anaconda-project.yml
index 6b59c05a0..a92b9d829 100644
--- a/voila_gpx_viewer/anaconda-project.yml
+++ b/voila_gpx_viewer/anaconda-project.yml
@@ -9,6 +9,8 @@ labels:
   - bqplot
   - ipyleaflet
 
+user_fields: [labels, skip, maintainers]
+
 channels:
   - conda-forge
 
diff --git a/walker_lake/anaconda-project.yml b/walker_lake/anaconda-project.yml
index 14350060e..11a9d872b 100644
--- a/walker_lake/anaconda-project.yml
+++ b/walker_lake/anaconda-project.yml
@@ -7,6 +7,8 @@ labels:
   - datashader
   - geoviews
 
+user_fields: [labels, skip, maintainers]
+
 channels: [conda-forge]
 
 packages: &pkgs