Remove upstreamed patch. Fixed license info. Several whitespace changes. Signed-off-by: Rosen Penev <rosenp@gmail.com>