From aebc240314a83afbe3c48f15228cd541596052b5 Mon Sep 17 00:00:00 2001
From: Eric Anderson <andersoe@ece.cmu.edu>
Date: Mon, 3 Oct 2011 13:46:25 -0400
Subject: [PATCH] Stop passing around tokeniser, make it part of class