Merge pull request #1710 from sciunto/favicon

DOC: activate favicon in config + fix doc push

doc/source/conf.py

@@ -147,7 +147,7 @@ html_title = 'skimage v%s docs' % version
 # The name of an image file (within the static path) to use as favicon of the
 # docs.  This file should be a Windows icon file (.ico) being 16x16 or 32x32
 # pixels large.
-#html_favicon = None
+html_favicon = '_static/favicon.ico'
 
 # Add any paths that contain custom static files (such as style sheets) here,
 # relative to this directory. They are copied after the builtin static files,

tools/deploy_docs.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-if [[ $TRAVIS_PULL_REQUEST == false && $TRAVIS_BRANCH == "master" && $PY == 3.4 ]]
+if [[ $TRAVIS_BRANCH == "master" && $PY == 3.4 ]]
 then
     # See https://help.github.com/articles/creating-an-access-token-for-command-line-use/ for how to generate a token
     # See http://docs.travis-ci.com/user/encryption-keys/ for how to generate