Added proper header merging to the simple server.

This currently breaks with Python 3.