Updates to courseTokenizer methods
fixed master merge conflicts