Changed indentation to use tabs instead of spaces
Merge pull request #1067 from sublimator/master.

Conflicts:
	repositories.json
Merge pull request #1165 from Phunky/master

Add madebyphunky color scheme
Merge pull request #1195 from robinmalburn/master

Add plugin Tab Filter.

Conflicts:
	repositories.json
Merge pull request #1199 from GravityScore/master

Added ComputerCraft Syntax Highlighting and Code Completions Package
Merge pull request #1200 from clslrns/master

Add bitrix-painkiller.

Conflicts:
	repositories.json
Merge pull request #1203 from mmorearty/patch-elixir

Remove out-of-date "Elixir" package, add new one
Merge pull request #1205 from Idered/master

Add "Esuna Framework Snippets" package
Merge pull request #1220 from rodrigoflores/master.

Adds today to package control

Conflicts:
	repositories.json
Merge pull request #1224 from bitbonsai/master

Added JSHint-Inline
Merge pull request #1226 from mlf4aiur/master

Added 'Markup Jira Confluence' to repositories.
Added sublime_diagram_plugin ("Diagram") repo
Adds StackMob JS Snippets to Package Control
Merge pull request #1227 from bradfeehan/master

Add bradfeehan/SublimePHPCoverage
Merge pull request #1232 from tynril/master

Added 'sublime-premake' to the repositories
Merge pull request #1233 from lcdsantos/master

Added CSSFontFamily
Rename "Strapdown.js Preview" to "Strapdown.js Markdown Preview".
Merge branch 'refs/heads/michfield'
Merge pull request #1236 from Iristyle/patch-3

Add Flatland Theme
Merge pull request #1238 from iiAtlas/master

Added https://github.com/iiAtlas/SmartGoogle