add generic json object syntax def so that other syntax defs can use it
add basic string syntax def for json
improve sublime build syntax def
ï»¿# HG changeset patch
# User Guillermo Lâ”œâ”‚pez <guilan70@hotmail.com>
# Date 1346793943 -7200
# Node ID 8f042bf2c12c0f6eda9ee8afee360448595e00d6
# Parent  0058037b0ade97de24f6bdb44de0494e8726e3bf
add generic json object syntax def so that other syntax defs can use it
merge
generate file
add rule
improve key map syntax def
improve completions syntax def; minor changes to scripts
Merge remote-tracking branch 'SublimeText/master' into enhanced_conversion

Conflicts:
	Syntax Definitions/Sublime Completions.JSON-tmLanguage
	Syntax Definitions/Sublime Completions.tmLanguage
	Syntax Definitions/Sublime Key Map.JSON-tmLanguage
	Syntax Definitions/Sublime Key Map.tmLanguage
	Syntax Definitions/Sublime Text Build System.JSON-tmLanguage
	Syntax Definitions/Sublime Text Build System.tmLanguage
Fix #15 and hope, it does not have any side effects