Fix travis build
Merge branch 'master' into python3
Minor .travis.yaml cleanup
Various cleanups