Merge pull request #1520 from TheBlueMatt/debian
Update contrib/debian and remove system json_spirit patch.