improved token management
added needed functionality in tokenmanager and started factoring parsers
added needed functionality in tokenmanager and started factoring parsers (take two)
Merge branch 'nvp' of git://github.com/reolyze/Mogu into Borel