Merge branch 'update-colormap-user-page' of github.com:kthyng/matplotlib into update-colormap-user-page

Author: kthyng

.travis.yml

@@ -78,7 +78,7 @@ install:
 
   - |
     if [[ $BUILD_DOCS == true ]]; then
-      pip install $PRE numpydoc ipython
+      pip install $PRE numpydoc ipython colorspacious
       pip install -q $PRE linkchecker
       wget https://github.com/google/fonts/blob/master/ofl/felipa/Felipa-Regular.ttf?raw=true -O Felipa-Regular.ttf
       wget http://mirrors.kernel.org/ubuntu/pool/universe/f/fonts-humor-sans/fonts-humor-sans_1.0-1_all.deb