Converted over to latest Censored Lib.
I think it's safe to merge the branches now, so I'll go ahead and do so.