Change org.json dependency to wink-json4j

Branch based off of v20131014.

All tests pass as far as I could see.  The and build failed at the end to trasnform the junit xml file or something, loading the results it was all green though.

I would love for you guys to do a v20131014-1 version release before baking these types of changes into master.  I cannot drop java6 support yet.