Fix some dependencies.

2 failures when running `rake spec`.
Backport to fix CVE-2013-1756.
Merge pull request #260 from embarkmobile/ver0.8.x

Backport of marshall checks to 0.8.x