Updated the package to the latest upstream version. Removed a patch that was merged upstream. Bumped copyright notice to 2015. Signed-off-by: Martin Rowe <martin.p.rowe@gmail.com>