Managed to completely screw up whitespace in the last merge

Merge remote-tracking branch 'upstream/sublime-text-3' into sublime-text-3

Conflicts:
	SublimeLinter.py
	sublimelinter/modules/git_commit_message.py
	sublimelinter/modules/sublime_pylint.py