Morsgault/NinJava — pull request #4 by gbchaosmaster (2012-11-04 18:27:54+00:00)
Title: All-in-one PR for previous improvements

Some of the previous commits will cause merge conflicts- if you want to accept all of them, don't do them individually- just accept this one and close the other three. If you want to choose which ones to accept, then of course close this one and pick from the assortment.