Fixes

Additional Travis fix for using pypi mirrors + fix broken test from 90f56db8