Merge pull request #138 from rubychan/remove-dump

Remove dump/undump functionality from Tokens
changelog
use different key/value heuristic in JSON scanner
remove Ruby 2.0 workaround
tags should be bold
use JSON to highlight .template files (AWS CF)