Updated NTripleSpout (not Sina's NTriplesSpout) to handle cases for both systems.

All other updates are correcting errors in both systems to make them nice and compatible with the NTripleSpout