Merge pull request #4 from aspiers/master

Getting closer to a passing build!  This shows the Marshal-related breakage which should now be fixed.  Maybe next time will be the lucky one ...
Update to latest in https://github.com/crowbar/crowbar master