Disabled extending line comment in DocBlocker.
Added FileDiffs package
Merge branch 'master' of github.com:tarwich/Settings

Conflicts:
	Sublime-Packages/User/Package Control.sublime-settings
	Sublime-Packages/User/Preferences.sublime-settings
Merge branch 'master' of github.com:tarwich/Settings