Started to get rid of marshmallow in favor of @marshal_with
Forgot a comma
Industry converted to use marshalling
Finalised conversion, took out marshmallow
One last tiny correction
Merge pull request #1 from rvbiljouw/feature/marshalling

Got rid of marshmallow