Cleanup of scanner.

Removed redundancy of keyword definitions and removed some unused token
predicates.
Comments for the TOKEN_LIST usage.
Merge pull request #547 from chriseth/sol_scannercleanup

Cleanup of scanner.