From work: remove whitespace enabled
Merge branch 'master' of github.com:ssteele/sublime_prefs

Conflicts:
	Package Control.cache/ad7758d143e99a76034aad71ae2a1f3b
	Package Control.cache/ad7758d143e99a76034aad71ae2a1f3b.info
	Package Control.sublime-settings
Merge branch 'master' of github.com:ssteele/sublime_prefs

Conflicts:
	Package Control.cache/ad7758d143e99a76034aad71ae2a1f3b
	Package Control.cache/ad7758d143e99a76034aad71ae2a1f3b.info
	Package Control.sublime-settings