Mark two more tests as slow_test
Add config option for handling bad Content-Transfer-Encoding
Move options header parsing elsewhere
Miscellaneous cleanup of unused stuff