Modified JSON reipe parsing to fix debugger exceptions
Having not used astyle before, I was copying-pasting too literally into vim and not reading the error message. Simple fix, and I'm now an astyle convert.
Merge remote-tracking branch 'upstream/master' into martial-arts-block-fix
* Please know this is a bit of a black box and only via the grand oracle google, right hand lackey stack overflow, and various other articles, I think the one compiler flag I added and the suggestions for compiling on OSX are now correct.

* Also note that if the warnings I'm getting are correct, the min version of CDDA might now be OS 10.7 on Mac. Someone who is more mac knowledgeable (I'm sort of a Mac user because I need to be, not because I spend time building mac programs) might know how to compile to less than OS 10.7.

That said, it works for me, and I can get back to playing the game, enjoying new content, and trying to fix bugs. (Historical note: I'm using OS 10.9 (mavericks)).
Merge remote-tracking branch 'upstream/master' into martial-arts-block-fix
Merge remote-tracking branches 'dda/pr/7709' and 'dda/pr/7716' into dda-master

* dda/pr/7709:
  Having not used astyle before, I was copying-pasting too literally into vim and not reading the error message. Simple fix, and I'm now an astyle convert.

* dda/pr/7716:
  * Please know this is a bit of a black box and only via the grand oracle google, right hand lackey stack overflow, and various other articles, I think the one compiler flag I added and the suggestions for compiling on OSX are now correct.
Essentially same changes wishbringer made before I could get back to this. Pushing to my own repo just so I have a completed branch.
Merge remote-tracking branch 'CleverRaven/master' into FrankenMod
Merge remote-tracking branch 'jeremyosborne/martial-arts-block-fix' into FrankenMod
Fixed CodeBlocks build for c++11
Merge remote-tracking branch 'jeremyosborne/martial-arts-block-fix' into FrankenMod

Conflicts:
	src/martialarts.cpp
Merge remote-tracking branch 'MattAmmann/cbp_fix' into FrankenMod
Merge remote-tracking branch 'MattAmmann/jsonParseFix' into FrankenMod