Upgrade from Bill Ota and fixes for TravisCI