Several fixes

Based on Stefan's fix for Travis, here a new PR that replaces https://github.com/scikit-image/scikit-image/pull/994.