Commit from windows machine
Merge branch 'master' of https://github.com/chuckhendo/sublime-plugins

Conflicts:
	.gitignore
	Packages/User/Package Control.sublime-settings
	Packages/User/Preferences.sublime-settings