Fixed an alphabitzation that broke in the merge. Also deleted out of date commented out code.:
Uncommeded visit while. Not sure why it was commented out.
Merge pull request #50 from daviis/alphabitize

Fixed small break in last merge