update
Merge branch 'master' of github.com:taballa/sublime-packages

Conflicts:
	Color Highlighter/ColorHighlighter.py
	EditorConfig/package-metadata.json
	EditorConfig/readme.md
	Markdown Preview/MarkdownPreview.py
	Markdown Preview/package-metadata.json
	User/Preferences.sublime-settings