GalenEvil/Cataclysm-DDA-1 — pull request #6 by kevingranade (2013-10-02 04:12:10+00:00)
Title: Jsonization restyle

I was in the midst of a merge that fixed up a bunch of stuff, then hit mtypedef.cpp, which is not remotely ready to go. So here's a merge and cleanup.