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)
Merge branch 'master' into cleanup-output