Singly/hallway — pull request #648 by quartzjer (2012-11-06 21:51:31+00:00)
Title: Token cleanup

very simple cleanup first pass to something better!