Use skip instead of scan in Tokenizer

Also skip Factor and VimL line comments
Formatting
Fix tokenizer specs for new hashes
Fix Classifier spec for token hashes
Fix API specs for new tokens hash