refactor grunt file
Merge branch 'master' into errorbodies
fix Safari under test where errors thrown by XmlHttpRequests weren't picked up as errors