Token -> token

libsyntax/parse/token.rs re-exports all of Token's variants, so we can still
write something like token::Eof
DelimToken -> token

As noted earlier, libsyntax/parse/token.rs exports all of Token, but also the
other token types (DelimToken, etc), so these can be accessed directly on module
token.
Merge branch 'bring-up-to-speed' of github.com:laumann/rustfmt into bring-up-to-speed

Conflicts:
	src/format.rs