Various small fixes of scripts indent

This is the same as https://github.com/andresriancho/w3af/pull/1900 but with the two contentious commits reverted. Hope that's okay now!