Cleanups.
Merge github/master

Conflicts:
	HTTP/Response.php
More cleanups.