Merge config from 1.9.32.1
Merge pull request #809 from pagespeed/crowell-update-config

Merge config from 1.9.32.1
Remove unit tests; They are now in system_test.sh
Merge remote-tracking branch 'origin/trunk-tracking' into cheesy-device-matching