fix regex
add back an exclusion
jsbeautify so diffs are reasonable
add jsbeautify to make diff reading easier
Bug 1101348 Changing the version of the shipped toolbar to 3.2.6, r=mixedpuppy