Cleaned up a couple errant functions, refactor

* Commented about a line to *not* remove.
* BaseRenderer function renamed
* Removed unused function from Tokenizer
Merge remote-tracking branch 'upstream/master'

Conflicts:
	src/Parrot/Lexer/Tokenizer.cs