Adding missed removes/adds from previous commit; modified .travis.yml