Removed upstreamed patch. Also added a patch to fix Travis. Signed-off-by: Rosen Penev <rosenp@gmail.com> Tested-by: Karl Palsson <karlp@etactica.com>