Minor cleanup of HTTP server: tests pass
Merge pull request #30 from aphyr/master

Minor cleanup of HTTP server: tests pass