Merge branch 'dev'
Merge branch 'dev'
Merge branch 'dev'
update preference source for SublimeSocket3
add ignore
bug against Sublime Text 3 build 3059 is fixed.
Merge branch 'hotfix'
Merge branch 'dev'

Conflicts:
	.gitignore
	README.md
	SublimeSocketAPISettings.py
	SublimeWSServer.py
add run_sushijson command
Merge branch 'hotfix' into dev