More cleanup script changes and ensure this shows a Travis error.
More cleanup script changes and ensure this shows a Travis error.

nth10sd/funfuzz,MozillaSecurity/funfuzz,MozillaSecurity/funfuzz,nth10sd/funfuzz,nth10sd/funfuzz,MozillaSecurity/funfuzz