tweak :local_variable token color
whitespace
fix diff/json token nesting issue
use -w in executable tests