Added features to Token type.
Lars Mahler - lmahler@andrew.cmu.edu